From e96d2aa5dc96c5950aa23d0872986f2ba5bdc07b Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Thu, 21 Sep 2023 16:59:33 +0200 Subject: [PATCH 001/166] Setup AdminBundle as a Node.js package --- package.json | 1 + src/Sylius/Bundle/AdminBundle/index.js | 44 ++++++++++++++++++++++ src/Sylius/Bundle/AdminBundle/package.json | 27 +++++++++++++ webpack.config.js | 20 ++-------- 4 files changed, 75 insertions(+), 17 deletions(-) create mode 100644 src/Sylius/Bundle/AdminBundle/index.js create mode 100644 src/Sylius/Bundle/AdminBundle/package.json diff --git a/package.json b/package.json index ae3b19a68b..9257dcf4fd 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "license": "MIT", "author": "Sylius Sp. z o.o.", "dependencies": { + "@sylius-ui/admin": "file:src/Sylius/Bundle/AdminBundle", "chart.js": "^3.7.1", "jquery": "^3.5.0", "jquery.dirtyforms": "^2.0.0", diff --git a/src/Sylius/Bundle/AdminBundle/index.js b/src/Sylius/Bundle/AdminBundle/index.js new file mode 100644 index 0000000000..923fcee96e --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/index.js @@ -0,0 +1,44 @@ +/* + * This file is part of the Sylius package. + * + * (c) Sylius Sp. z o.o. + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +const path = require('path'); +const Encore = require('@symfony/webpack-encore'); + +class SyliusAdmin { + static getWebpackConfig() { + const uiBundleScripts = path.resolve(__dirname, '../UiBundle/Resources/private/js/'); + const uiBundleResources = path.resolve(__dirname, '../UiBundle/Resources/private/'); + + Encore + .setOutputPath('public/build/admin/') + .setPublicPath('/build/admin') + .addEntry('admin-entry', path.resolve(__dirname, 'Resources/assets/entrypoint.js')) + .disableSingleRuntimeChunk() + .cleanupOutputBeforeBuild() + .enableSourceMaps(!Encore.isProduction()) + .enableVersioning(Encore.isProduction()) + .enableSassLoader((options) => { + // eslint-disable-next-line no-param-reassign + options.additionalData = `$assetsPath: ${path.resolve(__dirname, 'Resources/assets')};`; + }); + + const adminConfig = Encore.getWebpackConfig(); + + adminConfig.resolve.alias['sylius/ui'] = uiBundleScripts; + adminConfig.resolve.alias['sylius/ui-resources'] = uiBundleResources; + adminConfig.externals = { ...adminConfig.externals, window: 'window', document: 'document' }; + adminConfig.name = 'admin'; + + Encore.reset(); + + return adminConfig; + } +} + +module.exports = SyliusAdmin; diff --git a/src/Sylius/Bundle/AdminBundle/package.json b/src/Sylius/Bundle/AdminBundle/package.json new file mode 100644 index 0000000000..617a14b7cb --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/package.json @@ -0,0 +1,27 @@ +{ + "name": "@sylius-ui/admin", + "version": "1.0.0", + "license": "MIT", + "author": "Sylius Sp. z o.o.", + "dependencies": { + "@popperjs/core": "^2.11.8", + "@symfony/webpack-encore": "^3.1.0", + "@tabler/core": "^1.0.0-beta20", + "apexcharts": "^3.41.0", + "bootstrap": "^5.3.0", + "choices.js": "^10.2.0" + }, + "devDependencies": { + "sass": "^1.54.8", + "sass-loader": "^13.0.0" + }, + "engines": { + "node": "^18 || ^20" + }, + "engineStrict": true, + "main": "index.js", + "repository": { + "type": "git", + "url": "git+https://github.com/Sylius/SyliusAdminBundle.git" + } +} diff --git a/webpack.config.js b/webpack.config.js index 8b1ebe62cd..0654b5eaea 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,6 +1,8 @@ const path = require('path'); const Encore = require('@symfony/webpack-encore'); +const SyliusAdmin = require('@sylius-ui/admin'); + const uiBundleScripts = path.resolve(__dirname, 'src/Sylius/Bundle/UiBundle/Resources/private/js/'); const uiBundleResources = path.resolve(__dirname, 'src/Sylius/Bundle/UiBundle/Resources/private/'); @@ -23,22 +25,6 @@ shopConfig.name = 'shop'; Encore.reset(); -// Admin config -Encore - .setOutputPath('public/build/admin/') - .setPublicPath('/build/admin') - .addEntry('admin-entry', './src/Sylius/Bundle/AdminBundle/Resources/private/entry.js') - .disableSingleRuntimeChunk() - .cleanupOutputBeforeBuild() - .enableSourceMaps(!Encore.isProduction()) - .enableVersioning(Encore.isProduction()) - .enableSassLoader(); - -const adminConfig = Encore.getWebpackConfig(); - -adminConfig.resolve.alias['sylius/ui'] = uiBundleScripts; -adminConfig.resolve.alias['sylius/ui-resources'] = uiBundleResources; -adminConfig.externals = Object.assign({}, adminConfig.externals, { window: 'window', document: 'document' }); -adminConfig.name = 'admin'; +const adminConfig = SyliusAdmin.getWebpackConfig(); module.exports = [shopConfig, adminConfig]; From a3dd068e025d0550f331dce3cec644b32c9ce04a Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Fri, 22 Sep 2023 08:27:12 +0200 Subject: [PATCH 002/166] Switch to the dev branch of tabler --- src/Sylius/Bundle/AdminBundle/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Sylius/Bundle/AdminBundle/package.json b/src/Sylius/Bundle/AdminBundle/package.json index 617a14b7cb..96ed630ce6 100644 --- a/src/Sylius/Bundle/AdminBundle/package.json +++ b/src/Sylius/Bundle/AdminBundle/package.json @@ -6,7 +6,7 @@ "dependencies": { "@popperjs/core": "^2.11.8", "@symfony/webpack-encore": "^3.1.0", - "@tabler/core": "^1.0.0-beta20", + "@tabler/core": "tabler/tabler#dev", "apexcharts": "^3.41.0", "bootstrap": "^5.3.0", "choices.js": "^10.2.0" From c4f700b6d284beaef000d11747aa6909baf98db9 Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Fri, 22 Sep 2023 08:27:38 +0200 Subject: [PATCH 003/166] Add the $rootDir variable to the SCSS loader --- src/Sylius/Bundle/AdminBundle/index.js | 4 ++-- webpack.config.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Sylius/Bundle/AdminBundle/index.js b/src/Sylius/Bundle/AdminBundle/index.js index 923fcee96e..fe38691704 100644 --- a/src/Sylius/Bundle/AdminBundle/index.js +++ b/src/Sylius/Bundle/AdminBundle/index.js @@ -11,7 +11,7 @@ const path = require('path'); const Encore = require('@symfony/webpack-encore'); class SyliusAdmin { - static getWebpackConfig() { + static getWebpackConfig(rootDir) { const uiBundleScripts = path.resolve(__dirname, '../UiBundle/Resources/private/js/'); const uiBundleResources = path.resolve(__dirname, '../UiBundle/Resources/private/'); @@ -25,7 +25,7 @@ class SyliusAdmin { .enableVersioning(Encore.isProduction()) .enableSassLoader((options) => { // eslint-disable-next-line no-param-reassign - options.additionalData = `$assetsPath: ${path.resolve(__dirname, 'Resources/assets')};`; + options.additionalData = `$rootDir: ${rootDir};`; }); const adminConfig = Encore.getWebpackConfig(); diff --git a/webpack.config.js b/webpack.config.js index 0654b5eaea..9490ea0f7c 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -25,6 +25,6 @@ shopConfig.name = 'shop'; Encore.reset(); -const adminConfig = SyliusAdmin.getWebpackConfig(); +const adminConfig = SyliusAdmin.getWebpackConfig(path.resolve(__dirname)); module.exports = [shopConfig, adminConfig]; From 3d98ff1f479656040c77f34b7e9dafef491f683f Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Fri, 22 Sep 2023 08:27:51 +0200 Subject: [PATCH 004/166] Set up entrypoint.js --- .../Resources/assets/entrypoint.js | 15 +++ .../Resources/assets/scripts/apexcharts.js | 99 +++++++++++++++++++ .../Resources/assets/scripts/choices.js | 22 +++++ .../Resources/assets/styles/_flags.scss | 11 +++ .../Resources/assets/styles/main.scss | 23 +++++ .../Resources/assets/styles/ui/_flags.scss | 31 ++++++ 6 files changed, 201 insertions(+) create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/assets/entrypoint.js create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/assets/scripts/apexcharts.js create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/assets/scripts/choices.js create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_flags.scss create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/assets/styles/main.scss create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/assets/styles/ui/_flags.scss diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/entrypoint.js b/src/Sylius/Bundle/AdminBundle/Resources/assets/entrypoint.js new file mode 100644 index 0000000000..778bf8d907 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/entrypoint.js @@ -0,0 +1,15 @@ +/* + * This file is part of the Sylius package. + * + * (c) Sylius Sp. z o.o. + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +import './styles/main.scss'; + +import './scripts/apexcharts'; +import './scripts/choices'; + +import 'bootstrap'; diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/scripts/apexcharts.js b/src/Sylius/Bundle/AdminBundle/Resources/assets/scripts/apexcharts.js new file mode 100644 index 0000000000..fe7bea214d --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/scripts/apexcharts.js @@ -0,0 +1,99 @@ +/* + * This file is part of the Sylius package. + * + * (c) Sylius Sp. z o.o. + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +import ApexCharts from 'apexcharts'; + +(function () { + const options = { + series: [{ + name: 'Inflation', + data: [2.3, 3.1, 4.0, 10.1, 4.0, 3.6, 3.2, 2.3, 1.4, 0.8, 0.5, 0.2], + }], + chart: { + height: 350, + type: 'bar', + }, + plotOptions: { + bar: { + borderRadius: 10, + dataLabels: { + position: 'top', // top, center, bottom + }, + }, + }, + dataLabels: { + enabled: true, + formatter(val) { + return `${val}%`; + }, + offsetY: -20, + style: { + fontSize: '12px', + colors: ['#304758'], + }, + }, + + xaxis: { + categories: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'], + position: 'top', + axisBorder: { + show: false, + }, + axisTicks: { + show: false, + }, + crosshairs: { + fill: { + type: 'gradient', + gradient: { + colorFrom: '#D8E3F0', + colorTo: '#BED1E6', + stops: [0, 100], + opacityFrom: 0.4, + opacityTo: 0.5, + }, + }, + }, + tooltip: { + enabled: true, + } + }, + yaxis: { + axisBorder: { + show: false, + }, + axisTicks: { + show: false, + }, + labels: { + show: false, + formatter(val) { + return `${val}%`; + }, + }, + + }, + title: { + floating: true, + offsetY: 330, + align: 'center', + style: { + color: '#444', + }, + }, + }; + + // eslint-disable-next-line no-undef + const ch = document.querySelector('#chart-demo'); + if (ch) { + // eslint-disable-next-line no-undef + const chart = new ApexCharts(document.querySelector('#chart-demo'), options); + chart.render(); + } +}()); diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/scripts/choices.js b/src/Sylius/Bundle/AdminBundle/Resources/assets/scripts/choices.js new file mode 100644 index 0000000000..a44587167b --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/scripts/choices.js @@ -0,0 +1,22 @@ +/* + * This file is part of the Sylius package. + * + * (c) Sylius Sp. z o.o. + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +import Choices from 'choices.js'; + +(function () { + // eslint-disable-next-line no-undef + const items = document.querySelectorAll('[data-choices]'); + + if (items.length) { + items.forEach((el) => { + // eslint-disable-next-line no-new + new Choices(el); + }); + } +}()); diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_flags.scss b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_flags.scss new file mode 100644 index 0000000000..783a3753de --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_flags.scss @@ -0,0 +1,11 @@ +/*! + * This file is part of the Sylius package. + * + * (c) Sylius Sp. z o.o. + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +@import "@tabler/core/src/scss/config"; +@import "ui/flags"; diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/main.scss b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/main.scss new file mode 100644 index 0000000000..4e3dad47ae --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/main.scss @@ -0,0 +1,23 @@ +/* + * This file is part of the Sylius package. + * + * (c) Sylius Sp. z o.o. + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +$assets-base: $rootDir + "/node_modules/@tabler/core/dist"; + +@import "choices.js/src/styles/choices.scss"; +@import "@tabler/core/src/scss/tabler.scss"; + + +// TODO: Once https://github.com/tabler/tabler/pull/1718 merged or resolve remove the custom _flags.scss and import the tabler's one +//@import "@tabler/core/src/scss/tabler-flags.scss"; +@import "_flags.scss"; + +body { + font-family: "Inter", sans-serif; + font-feature-settings: "cv03", "cv04", "cv11"; +} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/ui/_flags.scss b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/ui/_flags.scss new file mode 100644 index 0000000000..42729f92c9 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/ui/_flags.scss @@ -0,0 +1,31 @@ +$countries: ( + 'ad', 'af', 'ae', 'afrun', 'ag', 'ai', 'al', 'am', 'ao', 'aq', 'ar', 'as', 'at', 'au', 'aw', 'ax', 'az', 'ba', 'bb', 'bd', 'be', 'bf', 'bg', 'bh', 'bi', 'bj', 'bl', 'bm', 'bn', 'bo', 'bq-bo', 'bq-sa', 'bq-se', 'br', 'bs', 'bt', 'bv', 'bw', 'by', 'bz', 'ca', 'cc', 'cd', 'cf', 'cg', 'ch', 'ci', 'ck', 'cl', 'cm', 'cn', 'co', 'cr', 'cu', 'cv', 'cw', 'cx', 'cy', 'cz', 'de', 'dj', 'dk', 'dm', 'do', 'dz', 'ec', 'ee', 'eg', 'eh', 'er', 'es', 'et', 'eu', 'fi', 'fj', 'fk', 'fm', 'fo', 'fr', 'ga', 'gb-eng', 'gb-sct', 'gb', 'gb-wls', 'gb-nir', 'gd', 'ge', 'gf', 'gg', 'gh', 'gi', 'gl', 'gm', 'gn', 'gp', 'gq', 'gr', 'gs', 'gt', 'gu', 'gw', 'gy', 'hk', 'hm', 'hn', 'hr', 'ht', 'hu', 'id', 'ie', 'il', 'im', 'in', 'io', 'iq', 'ir', 'is', 'it', 'je', 'jm', 'jo', 'jp', 'ke', 'kg', 'kh', 'ki', 'km', 'kn', 'kp', 'kr', 'kw', 'ky', 'kz', 'la', 'lb', 'lc', 'li', 'lk', 'lr', 'ls', 'lt', 'lu', 'lv', 'ly', 'ma', 'mc', 'md', 'me', 'mf', 'mg', 'mh', 'mk', 'ml', 'mm', 'mn', 'mo', 'mp', 'mq', 'mr', 'ms', 'mt', 'mu', 'mv', 'mw', 'mx', 'my', 'mz', 'na', 'nc', 'ne', 'nf', 'ng', 'ni', 'nl', 'no', 'np', 'nr', 'nu', 'nz', 'om', 'pa', 'pe', 'pf', 'pg', 'ph', 'pk', 'pl', 'pm', 'pn', 'pr', 'ps', 'pt', 'pw', 'py', 'qa', 'rainbow', 're', 'ro', 'rs', 'ru', 'rw', 'sa', 'sb', 'sc', 'sd', 'se', 'sg', 'sh', 'si', 'sj', 'sk', 'sl', 'sm', 'sn', 'so', 'sr', 'ss', 'st', 'sv', 'sx', 'sy', 'sz', 'tc', 'td', 'tf', 'tg', 'th', 'tj', 'tk', 'tl', 'tm', 'tn', 'to', 'tr', 'tt', 'tv', 'tw', 'tz', 'ua', 'ug', 'um', 'unasur', 'us', 'uy', 'uz', 'va', 'vc', 've', 'vg', 'vi', 'vn', 'vu', 'wf', 'ws', 'ye', 'za', 'zm', 'zw' +); + +.flag { + position: relative; + display: inline-block; + height: $avatar-size; + aspect-ratio: 1.33333; + background: no-repeat center/cover; + box-shadow: $flag-box-shadow; + border-radius: $flag-border-radius; + vertical-align: bottom; + + &.flag-country-np { + box-shadow: none; + border-radius: 0; + } +} + +@each $country in $countries { + .flag-country-#{$country} { + background-image: url("#{$assets-base}/img/flags/#{$country}.svg"); + } +} + +@each $flag-size, $size in $flag-sizes { + .flag-#{$flag-size} { + height: map-get($size, size); + } +} From 4f29d2cd5d5dc90f36f39b7b374d5c7c2a3e8ab8 Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Fri, 22 Sep 2023 09:55:12 +0200 Subject: [PATCH 005/166] Add basic template events for CRUD's index --- .../Resources/config/app/config.yml | 2 +- .../Resources/config/app/events.yaml | 1370 ----------------- .../Resources/config/app/template_events.yaml | 13 + .../Resources/views/Crud/index.html.twig | 36 +- .../Shared/Crud/Common/_content.html.twig | 3 + .../Shared/Crud/Common/_navbar.html.twig | 5 + .../Shared/Crud/Common/_sidebar.html.twig | 5 + .../views/Shared/Crud/index.html.twig | 14 + .../views/Shared/Layout/base.html.twig | 22 + 9 files changed, 82 insertions(+), 1388 deletions(-) delete mode 100644 src/Sylius/Bundle/AdminBundle/Resources/config/app/events.yaml create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_content.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_navbar.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_sidebar.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/index.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Layout/base.html.twig diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/config.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/config.yml index 9c1dd7975d..35b0b07b08 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/app/config.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/config.yml @@ -1,7 +1,7 @@ imports: - { resource: "@SyliusUiBundle/Resources/config/app/config.yml" } - - { resource: "@SyliusAdminBundle/Resources/config/app/events.yaml" } + - { resource: "@SyliusAdminBundle/Resources/config/app/template_events.yaml" } - { resource: "@SyliusAdminBundle/Resources/config/app/sylius/sylius_mailer.yml" } - { resource: "@SyliusAdminBundle/Resources/config/grids/address_log_entry.yml" } - { resource: "@SyliusAdminBundle/Resources/config/grids/admin_user.yml" } diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/events.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/events.yaml deleted file mode 100644 index 4f45dcf2fc..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/app/events.yaml +++ /dev/null @@ -1,1370 +0,0 @@ -# This file is part of the Sylius package. -# (c) Sylius Sp. z o.o. - -sylius_ui: - events: - sylius.admin.index: - blocks: - before_header_legacy: - template: "@SyliusAdmin/Crud/Block/_legacySonataEvent.html.twig" - priority: 25 - context: - postfix: index.before_header - header: - template: "@SyliusAdmin/Crud/Index/_header.html.twig" - priority: 20 - after_header_legacy: - template: "@SyliusAdmin/Crud/Block/_legacySonataEvent.html.twig" - priority: 15 - context: - postfix: index.after_header - content: - template: "@SyliusAdmin/Crud/Index/_content.html.twig" - priority: 10 - after_content: - template: "@SyliusAdmin/Crud/Block/_legacySonataEvent.html.twig" - priority: 5 - context: - postfix: index.after_content - - sylius.admin.index.stylesheets: - blocks: - legacy: - template: "@SyliusAdmin/Crud/Block/_legacySonataEvent.html.twig" - priority: 5 - context: - postfix: index.stylesheets - - sylius.admin.index.javascripts: - blocks: - legacy: - template: "@SyliusAdmin/Crud/Block/_legacySonataEvent.html.twig" - priority: 5 - context: - postfix: index.javascripts - - sylius.admin.index.header: - blocks: - legacy: - template: "@SyliusAdmin/Crud/Block/_legacySonataEvent.html.twig" - context: - postfix: index.header - - sylius.admin.create: - blocks: - before_header_legacy: - template: "@SyliusAdmin/Crud/Block/_legacySonataEvent.html.twig" - priority: 25 - context: - postfix: create.before_header - header: - template: "@SyliusAdmin/Crud/Create/_header.html.twig" - priority: 20 - after_header_legacy: - template: "@SyliusAdmin/Crud/Block/_legacySonataEvent.html.twig" - priority: 15 - context: - postfix: create.after_header - content: - template: "@SyliusAdmin/Crud/Create/_content.html.twig" - priority: 10 - after_content: - template: "@SyliusAdmin/Crud/Block/_legacySonataEvent.html.twig" - priority: 5 - context: - postfix: create.after_content - - sylius.admin.create.stylesheets: - blocks: - legacy: - template: "@SyliusAdmin/Crud/Block/_legacySonataEvent.html.twig" - context: - postfix: create.stylesheets - - sylius.admin.create.javascripts: - blocks: - legacy: - template: "@SyliusAdmin/Crud/Block/_legacySonataEvent.html.twig" - context: - postfix: create.javascripts - - sylius.admin.create.header: - blocks: - legacy: - template: "@SyliusAdmin/Crud/Block/_legacySonataEvent.html.twig" - context: - postfix: create.header - - sylius.admin.create.form: - blocks: - legacy: - template: "@SyliusAdmin/Crud/Block/_legacySonataEvent.html.twig" - context: - postfix: create.form - - sylius.admin.update: - blocks: - before_header_legacy: - template: "@SyliusAdmin/Crud/Block/_legacySonataEvent.html.twig" - priority: 25 - context: - postfix: update.before_header - header: - template: "@SyliusAdmin/Crud/Update/_header.html.twig" - priority: 20 - after_header_legacy: - template: "@SyliusAdmin/Crud/Block/_legacySonataEvent.html.twig" - priority: 15 - context: - postfix: update.after_header - content: - template: "@SyliusAdmin/Crud/Update/_content.html.twig" - priority: 10 - after_content: - template: "@SyliusAdmin/Crud/Block/_legacySonataEvent.html.twig" - priority: 5 - context: - postfix: update.after_content - - sylius.admin.update.stylesheets: - blocks: - legacy: - template: "@SyliusAdmin/Crud/Block/_legacySonataEvent.html.twig" - context: - postfix: update.stylesheets - - sylius.admin.update.javascripts: - blocks: - legacy: - template: "@SyliusAdmin/Crud/Block/_legacySonataEvent.html.twig" - context: - postfix: update.javascripts - - sylius.admin.update.header: - blocks: - legacy: - template: "@SyliusAdmin/Crud/Block/_legacySonataEvent.html.twig" - context: - postfix: update.header - - sylius.admin.update.form: - blocks: - legacy: - template: "@SyliusAdmin/Crud/Block/_legacySonataEvent.html.twig" - context: - postfix: update.form - - sylius.admin.layout.sidebar: - blocks: - top_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 25 - context: - event: sylius.admin.layout.sidebar_top - logo: - template: "@SyliusAdmin/_logo.html.twig" - priority: 20 - menu: - template: "@SyliusAdmin/_menu.html.twig" - priority: 10 - down_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 5 - context: - event: sylius.admin.layout.sidebar_down - - sylius.admin.layout.javascripts: - blocks: - scripts: - template: "@SyliusAdmin/_scripts.html.twig" - priority: 10 - legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 0 - context: - event: sylius.admin.layout.javascripts - - sylius.admin.layout.stylesheets: - blocks: - styles: - template: "@SyliusAdmin/_styles.html.twig" - priority: 10 - legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 0 - context: - event: sylius.admin.layout.stylesheets - - sylius.admin.layout.topbar_left: - blocks: - sidebar_toggle: - template: "@SyliusAdmin/Layout/_sidebarToggle.html.twig" - priority: 30 - legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 25 - context: - event: sylius.admin.layout.topbar_left - channel_links: - template: "@SyliusAdmin/Layout/_channelLinksWidget.html.twig" - priority: 20 - search: - template: "@SyliusAdmin/_search.html.twig" - priority: 10 - - sylius.admin.layout.topbar_middle: - blocks: - legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - context: - event: sylius.admin.layout.topbar_middle - - sylius.admin.layout.topbar_right: - blocks: - notifications: - template: "@SyliusAdmin/Layout/_notificationWidget.html.twig" - priority: 30 - support: - template: "@SyliusAdmin/_support.html.twig" - priority: 20 - security: - template: "@SyliusAdmin/_security.html.twig" - priority: 10 - legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 5 - context: - event: sylius.admin.layout.topbar_right - - sylius.admin.order.update.form: - blocks: - legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - context: - event: sylius.admin.order.update.form - - sylius.admin.product_variant.generate.form: - blocks: - legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - context: - event: sylius.admin.product_variant.generate.form - - sylius.admin.promotion_coupon.generate.form: - blocks: - legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - context: - event: sylius.admin.promotion_coupon.generate.form - - sylius.admin.login.form: - blocks: - legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - context: - event: sylius.admin.login.form - - sylius.admin.taxon.update.before_content: - blocks: - legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - context: - event: sylius.admin.taxon.update.before_content - - sylius.admin.taxon.create.before_content: - blocks: - legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - context: - event: sylius.admin.taxon.create.before_content - - sylius.admin.taxon.create.taxon_tree: - blocks: - before_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 15 - context: - event: sylius.admin.taxon.create.before_taxon_tree - tree: - template: "@SyliusAdmin/Taxon/_taxonTree.html.twig" - priority: 10 - after_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 5 - context: - event: sylius.admin.taxon.create.after_taxon_tree - - sylius.admin.taxon.update.taxon_tree: - blocks: - before_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 15 - context: - event: sylius.admin.taxon.update.before_taxon_tree - tree: - template: "@SyliusAdmin/Taxon/_taxonTree.html.twig" - priority: 10 - after_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 5 - context: - event: sylius.admin.taxon.update.after_taxon_tree - - sylius.admin.login.content: - blocks: - before_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 15 - context: - event: sylius.admin.login.before_content - tree: - template: "@SyliusAdmin/Security/_content.html.twig" - priority: 10 - after_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 5 - context: - event: sylius.admin.login.after_content - - sylius.admin.login.form.content: - blocks: - divider: - template: "@SyliusAdmin/_divider.html.twig" - priority: 0 - request_password_reset: - template: "@SyliusAdmin/Security/Form/_requestPasswordResetButton.html.twig" - priority: 0 - - sylius.admin.dashboard.header.content: - blocks: - legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - context: - event: sylius.admin.dashboard.header - - sylius.admin.product_variant.create.tab_taxes: - blocks: - legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - context: - event: sylius.admin.product_variant.create.tab_taxes - - sylius.admin.product_variant.update.tab_taxes: - blocks: - legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - context: - event: sylius.admin.product_variant.update.tab_taxes - - sylius.admin.product_variant.create.tab_details: - blocks: - legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - context: - event: sylius.admin.product_variant.create.tab_details - - sylius.admin.product_variant.update.tab_details: - blocks: - legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - context: - event: sylius.admin.product_variant.update.tab_details - - sylius.admin.product.create.tab_associations: - blocks: - legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - context: - event: sylius.admin.product.create.tab_associations - - sylius.admin.product.update.tab_associations: - blocks: - legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - context: - event: sylius.admin.product.update.tab_associations - - sylius.admin.product.create.tab_attributes: - blocks: - legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - context: - event: sylius.admin.product.create.tab_attributes - - sylius.admin.product.update.tab_attributes: - blocks: - legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - context: - event: sylius.admin.product.update.tab_attributes - - sylius.admin.product.create.tab_details: - blocks: - legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - context: - event: sylius.admin.product.create.tab_details - - sylius.admin.product.update.tab_details: - blocks: - legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - context: - event: sylius.admin.product.update.tab_details - - sylius.admin.product.create.tab_media: - blocks: - legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - context: - event: sylius.admin.product.create.tab_media - - sylius.admin.product.update.tab_media: - blocks: - legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - context: - event: sylius.admin.product.update.tab_media - - sylius.admin.product.create.tab_taxonomy: - blocks: - legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - context: - event: sylius.admin.product.create.tab_taxonomy - - sylius.admin.product.update.tab_taxonomy: - blocks: - legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - context: - event: sylius.admin.product.update.tab_taxonomy - - sylius.admin.promotion_coupon.index.content: - blocks: - before_header_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 25 - context: - event: sylius.admin.promotion_coupon.index.before_header - header: - template: "@SyliusAdmin/PromotionCoupon/Index/_headerWidget.html.twig" - priority: 20 - after_header_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 15 - context: - event: sylius.admin.promotion_coupon.index.after_header - content: - template: "@SyliusAdmin/Crud/Index/_content.html.twig" - priority: 10 - after_content_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 5 - context: - event: sylius.admin.promotion_coupon.index.after_content - - sylius.admin.promotion_coupon.generate.content: - blocks: - before_header_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 35 - context: - event: sylius.admin.promotion_coupon.generate.before_header - header: - template: "@SyliusAdmin/PromotionCoupon/Generate/_header.html.twig" - priority: 30 - after_header_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 25 - context: - event: sylius.admin.promotion_coupon.generate.after_header - breadcrumb: - template: "@SyliusAdmin/PromotionCoupon/Generate/_breadcrumb.html.twig" - priority: 20 - after_breadcrumb_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 15 - context: - event: sylius.admin.promotion_coupon.generate.after_breadcrumb - content: - template: "@SyliusAdmin/PromotionCoupon/Generate/_formWidget.html.twig" - priority: 10 - after_content_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 5 - context: - event: sylius.admin.promotion_coupon.generate.after_content - - sylius.admin.customer.show.address: - blocks: - before_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 25 - context: - event: sylius.admin.customer.show.before_address - header: - template: "@SyliusAdmin/Customer/Show/Address/_header.html.twig" - priority: 20 - content: - template: "@SyliusAdmin/Customer/Show/Address/_content.html.twig" - priority: 10 - after_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 5 - context: - event: sylius.admin.customer.show.after_address - - sylius.admin.order.update.content: - blocks: - before_header_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 35 - context: - event: sylius.admin.order.update.before_header - header: - template: "@SyliusAdmin/Order/Update/_header.html.twig" - priority: 30 - after_header_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 25 - context: - event: sylius.admin.order.update.after_header - breadcrumb: - template: "@SyliusAdmin/Order/Update/_breadcrumb.html.twig" - priority: 20 - after_breadcrumb_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 15 - context: - event: sylius.admin.order.update.after_breadcrumb - content: - template: "@SyliusAdmin/Order/Update/_content.html.twig" - priority: 10 - after_content_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 5 - context: - event: sylius.admin.order.update.after_content - - sylius.admin.order.show.content: - blocks: - before_header_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 35 - context: - event: sylius.admin.order.show.before_header - header: - template: "@SyliusAdmin/Order/Show/_headerWidget.html.twig" - priority: 30 - after_header_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 25 - context: - event: sylius.admin.order.show.after_header - breadcrumb: - template: "@SyliusAdmin/Order/Show/_breadcrumb.html.twig" - priority: 20 - after_breadcrumb_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 15 - context: - event: sylius.admin.order.show.after_breadcrumb - content: - template: "@SyliusAdmin/Order/Show/_content.html.twig" - priority: 10 - after_content_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 5 - context: - event: sylius.admin.order.show.after_content - - sylius.admin.order.show.summary: - blocks: - before_summary_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 25 - context: - event: sylius.admin.order.show.before_summary - summary: - template: "@SyliusAdmin/Order/Show/_summaryWidget.html.twig" - priority: 20 - after_summary_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 15 - context: - event: sylius.admin.order.show.after_summary - notes: - template: "@SyliusAdmin/Order/Show/_notes.html.twig" - priority: 10 - - sylius.admin.order.show.sidebar: - blocks: - before_customer_information_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 55 - context: - event: sylius.admin.order.show.before_customer_information - customer: - template: "@SyliusAdmin/Order/Show/_customer.html.twig" - priority: 50 - before_payments_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 45 - context: - event: sylius.admin.order.show.before_payments - payments: - template: "@SyliusAdmin/Order/Show/_payments.html.twig" - priority: 40 - shipments: - template: "@SyliusAdmin/Order/Show/_shipments.html.twig" - priority: 35 - before_addresses_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 30 - context: - event: sylius.admin.order.show.before_addresses - addresses: - template: "@SyliusAdmin/Order/Show/_addresses.html.twig" - priority: 20 - resend_email: - template: "@SyliusAdmin/Order/Show/_resendEmail.html.twig" - priority: 10 - after_shipments_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 5 - context: - event: sylius.admin.order.show.after_shipments - - sylius.admin.order.show.header_items: - blocks: - content: - template: '@SyliusAdmin/Order/Show/_headerItems.html.twig' - priority: 10 - - sylius.admin.order.show.payments_content: - blocks: - content: - template: '@SyliusAdmin/Order/Show/_paymentsContent.html.twig' - priority: 10 - - sylius.admin.order.show.payment_content: - blocks: - header: - template: '@SyliusAdmin/Order/Show/Payment/_header.html.twig' - priority: 40 - content: - template: '@SyliusAdmin/Order/Show/Payment/_content.html.twig' - priority: 30 - complete_transition: - template: '@SyliusAdmin/Order/Show/Payment/_completeTransition.html.twig' - priority: 20 - refund_transition: - template: '@SyliusAdmin/Order/Show/Payment/_refundTransition.html.twig' - priority: 10 - - sylius.admin.order.show.shipments_content: - blocks: - content: - template: '@SyliusAdmin/Order/Show/_shipmentsContent.html.twig' - priority: 10 - - sylius.admin.order.show.shipment_content: - blocks: - header: - template: '@SyliusAdmin/Order/Show/Shipment/_header.html.twig' - priority: 60 - content: - template: '@SyliusAdmin/Order/Show/Shipment/_content.html.twig' - priority: 50 - ship_transition: - template: '@SyliusAdmin/Order/Show/Shipment/_shipTransition.html.twig' - priority: 40 - tracking: - template: '@SyliusAdmin/Order/Show/Shipment/_tracking.html.twig' - priority: 30 - show_button: - template: '@SyliusAdmin/Order/Show/Shipment/_showButton.html.twig' - priority: 20 - resend_confirmation_email_button: - template: '@SyliusAdmin/Order/Show/Shipment/_resendConfirmationEmailButton.html.twig' - priority: 10 - - sylius.admin.customer.show.information: - blocks: - before_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 35 - context: - event: sylius.admin.customer.show.before_information - primary: - template: "@SyliusAdmin/Customer/Show/Details/_primary.html.twig" - priority: 30 - email: - template: "@SyliusAdmin/Customer/Show/Details/_email.html.twig" - priority: 20 - contact: - template: "@SyliusAdmin/Customer/Show/Details/_contact.html.twig" - priority: 10 - after_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 5 - context: - event: sylius.admin.customer.show.after_information - - sylius.admin.product_variant.index.content: - blocks: - before_header_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 25 - context: - event: sylius.admin.product_variant.index.before_header - header: - template: "@SyliusAdmin/ProductVariant/Index/_headerWidget.html.twig" - priority: 20 - after_header_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 15 - context: - event: sylius.admin.product_variant.index.after_header - content: - template: "@SyliusAdmin/Crud/Index/_content.html.twig" - priority: 10 - after_content_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 5 - context: - event: sylius.admin.product_variant.index.after_content - - sylius.admin.product_variant.generate.content: - blocks: - before_header_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 35 - context: - event: sylius.admin.product_variant.generate.before_header - header: - template: "@SyliusAdmin/ProductVariant/Generate/_header.html.twig" - priority: 30 - after_header_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 25 - context: - event: sylius.admin.product_variant.generate.after_header - breadcrumb: - template: "@SyliusAdmin/ProductVariant/Generate/_breadcrumb.html.twig" - priority: 20 - after_breadcrumb_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 15 - context: - event: sylius.admin.product_variant.generate.after_breadcrumb - content: - template: "@SyliusAdmin/ProductVariant/Generate/_content.html.twig" - priority: 10 - after_content_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 5 - context: - event: sylius.admin.product_variant.generate.after_content - - sylius.admin.order.history.content: - blocks: - before_header_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 35 - context: - event: sylius.admin.order.history.before_header - header: - template: "@SyliusAdmin/Order/History/_headerWidget.html.twig" - priority: 30 - after_header_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 25 - context: - event: sylius.admin.order.history.after_header - breadcrumb: - template: "@SyliusAdmin/Order/History/_breadcrumb.html.twig" - priority: 20 - after_breadcrumb_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 15 - context: - event: sylius.admin.order.history.after_breadcrumb - content: - template: "@SyliusAdmin/Order/History/_content.html.twig" - priority: 10 - after_content_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 5 - context: - event: sylius.admin.order.history.after_content - - sylius.admin.product.index.header: - blocks: - content: - template: "@SyliusAdmin/Product/Index/Header/_content.html.twig" - priority: 20 - legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 15 - context: - event: sylius.admin.product.index.header - breadcrumb: - template: "@SyliusAdmin/Product/Index/Header/_breadcrumb.html.twig" - priority: 10 - - sylius.admin.product_variant.index.header.content: - blocks: - content: - template: "@SyliusAdmin/ProductVariant/Index/ProductHeader/_content.html.twig" - priority: 20 - legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 15 - context: - event: sylius.admin.product_variant.index.header - breadcrumb: - template: "@SyliusAdmin/ProductVariant/Index/ProductHeader/_breadcrumb.html.twig" - priority: 10 - - sylius.admin.product.index.content: - blocks: - before_header_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 25 - context: - event: sylius.admin.product.index.before_header - header: - template: "@SyliusAdmin/Product/Index/_headerWidget.html.twig" - priority: 20 - after_header_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 15 - context: - event: sylius.admin.product.index.after_header - content: - template: "@SyliusAdmin/Product/Index/_content.html.twig" - priority: 10 - after_content_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 5 - context: - event: sylius.admin.product.index.after_content - - sylius.admin.product.show.variants_content: - blocks: - content: - template: '@SyliusAdmin/Product/Show/_variantsContent.html.twig' - priority: 10 - - sylius.admin.customer.show.content: - blocks: - before_header_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 45 - context: - event: sylius.admin.customer.show.before_header - header: - template: "@SyliusAdmin/Customer/Show/_headerWidget.html.twig" - priority: 40 - after_header_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 35 - context: - event: sylius.admin.customer.show.after_header - breadcrumb: - template: "@SyliusAdmin/Customer/Show/_breadcrumb.html.twig" - priority: 30 - after_breadcrumb_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 25 - context: - event: sylius.admin.customer.show.after_breadcrumb - statistics: - template: "@SyliusAdmin/Customer/Show/_statistics.html.twig" - priority: 20 - after_statistics_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 15 - context: - event: sylius.admin.customer.show.after_statistics - content: - template: "@SyliusAdmin/Customer/Show/_contentWidget.html.twig" - priority: 10 - after_content_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 5 - context: - event: sylius.admin.customer.show.after_content - - sylius.admin.dashboard.content: - blocks: - before_header_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 45 - context: - event: sylius.admin.dashboard.before_header - header: - template: "@SyliusAdmin/Dashboard/_header.html.twig" - priority: 40 - after_header_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 35 - context: - event: sylius.admin.dashboard.after_header - statistics: - template: "@SyliusAdmin/Dashboard/_statistics.html.twig" - priority: 30 - after_statistics_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 25 - context: - event: sylius.admin.customer.show.after_statistics - menu: - template: "@SyliusAdmin/Dashboard/_menu.html.twig" - priority: 20 - after_menu_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 15 - context: - event: sylius.admin.dashboard.after_menu - latest: - template: "@SyliusAdmin/Dashboard/_latest.html.twig" - priority: 10 - after_content_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 5 - context: - event: sylius.admin.dashboard.after_content - - sylius.admin.customer.show.header.content: - blocks: - content: - template: "@SyliusAdmin/Customer/Show/_header.html.twig" - priority: 20 - legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 15 - context: - event: sylius.admin.customer.show.header - menu: - template: "@SyliusAdmin/Customer/Show/_headerMenu.html.twig" - priority: 10 - - sylius.admin.product.index.content.main: - blocks: - legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 15 - context: - event: sylius.admin.product.index.content.before_filters - content: - template: "@SyliusAdmin/Crud/Index/_content.html.twig" - priority: 10 - - sylius.admin.product.index.content.sidebar: - blocks: - before_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 15 - context: - event: sylius.admin.product.index.before_taxon_tree - content: - template: "@SyliusAdmin/Product/Index/Content/_taxonTree.html.twig" - priority: 10 - after_legacy: - template: "@SyliusUi/Block/_legacySonataEvent.html.twig" - priority: 5 - context: - event: sylius.admin.product.index.after_taxon_tree - - sylius.admin.catalog_promotion.product_variant.index.content: - blocks: - header: - template: "@SyliusAdmin/CatalogPromotion/ProductVariant/Index/_headerWidget.html.twig" - priority: 20 - content: - template: "@SyliusAdmin/Crud/Index/_content.html.twig" - priority: 10 - - sylius.admin.catalog_promotion.product_variant.index.header.content: - blocks: - content: - template: "@SyliusAdmin/CatalogPromotion/ProductVariant/Index/Header/_content.html.twig" - priority: 20 - breadcrumb: - template: "@SyliusAdmin/CatalogPromotion/ProductVariant/Index/Header/_breadcrumb.html.twig" - priority: 10 - - sylius.admin.catalog_promotion.show.content: - blocks: - header: - template: "@SyliusAdmin/CatalogPromotion/Show/_headerWidget.html.twig" - priority: 15 - breadcrumb: - template: "@SyliusAdmin/CatalogPromotion/Show/_breadcrumb.html.twig" - priority: 10 - content: - template: "@SyliusAdmin/CatalogPromotion/Show/_content.html.twig" - priority: 5 - - sylius.admin.catalog_promotion.show.header.content: - blocks: - content: - template: "@SyliusAdmin/CatalogPromotion/Show/_header.html.twig" - priority: 10 - menu: - template: "@SyliusAdmin/CatalogPromotion/Show/_headerMenu.html.twig" - priority: 5 - - sylius.admin.catalog_promotion.show.content.left_bar: - blocks: - content: - template: "@SyliusAdmin/CatalogPromotion/Show/_details.html.twig" - priority: 10 - menu: - template: "@SyliusAdmin/CatalogPromotion/Show/_translations.html.twig" - priority: 5 - - sylius.admin.catalog_promotion.show.content.right_bar: - blocks: - content: - template: "@SyliusAdmin/CatalogPromotion/Show/_scopes.html.twig" - priority: 10 - menu: - template: "@SyliusAdmin/CatalogPromotion/Show/_actions.html.twig" - priority: 5 - - sylius.admin.admin_user.form: - blocks: - content: - template: '@SyliusAdmin/AdminUser/Form/_content.html.twig' - priority: 10 - - sylius.admin.admin_user.form.columns: - blocks: - first_column: - template: '@SyliusAdmin/AdminUser/Form/_firstColumn.html.twig' - priority: 20 - second_column: - template: '@SyliusAdmin/AdminUser/Form/_secondColumn.html.twig' - priority: 10 - - sylius.admin.admin_user.form.first_column: - blocks: - general_info: - template: '@SyliusAdmin/AdminUser/Form/_generalInfo.html.twig' - priority: 20 - general_info_extended: - template: '@SyliusAdmin/AdminUser/Form/_generalInfoExtended.html.twig' - priority: 10 - - sylius.admin.admin_user.form.second_column: - blocks: - additional_information: - template: '@SyliusAdmin/AdminUser/Form/_additionalInformation.html.twig' - priority: 20 - preferences: - template: '@SyliusAdmin/AdminUser/Form/_preferences.html.twig' - priority: 10 - - sylius.admin.admin_user.form.additional_information: - blocks: - personals: - template: '@SyliusAdmin/AdminUser/Form/_personals.html.twig' - priority: 20 - avatar: - template: '@SyliusAdmin/AdminUser/Form/_avatar.html.twig' - priority: 10 - - sylius.admin.channel.form: - blocks: - content: - template: '@SyliusAdmin/Channel/Form/_content.html.twig' - priority: 10 - - sylius.admin.channel.form.content: - blocks: - first_column: - template: '@SyliusAdmin/Channel/Form/_firstColumn.html.twig' - priority: 20 - second_column: - template: '@SyliusAdmin/Channel/Form/_secondColumn.html.twig' - priority: 10 - - sylius.admin.channel.form.first_column_content: - blocks: - general: - template: '@SyliusAdmin/Channel/Form/_general.html.twig' - priority: 40 - general_host: - template: '@SyliusAdmin/Channel/Form/_generalHost.html.twig' - priority: 30 - countries: - template: '@SyliusAdmin/Channel/Form/_countries.html.twig' - priority: 20 - required_address_in_checkout: - template: '@SyliusAdmin/Channel/Form/_shippingAddressInCheckoutRequired.html.twig' - priority: 15 - money: - template: '@SyliusAdmin/Channel/Form/_money.html.twig' - priority: 10 - - sylius.admin.channel.form.second_column_content: - blocks: - general: - template: '@SyliusAdmin/Channel/Form/_billingData.html.twig' - priority: 20 - look_and_feel: - template: '@SyliusAdmin/Channel/Form/_lookAndFeel.html.twig' - priority: 10 - price_history: - template: '@SyliusAdmin/Channel/Form/_priceHistoryConfig.html.twig' - priority: 0 - - sylius.admin.customer.form: - blocks: - content: - template: '@SyliusAdmin/Customer/Form/_content.html.twig' - priority: 10 - - sylius.admin.customer.form.content: - blocks: - columns: - template: '@SyliusAdmin/Customer/Form/_columns.html.twig' - priority: 10 - - sylius.admin.customer.form.first_column: - blocks: - content: - template: '@SyliusAdmin/Customer/Form/_firstColumn.html.twig' - priority: 10 - - sylius.admin.customer.form.customer_details: - blocks: - content: - template: '@SyliusAdmin/Customer/Form/_details.html.twig' - priority: 10 - - sylius.admin.customer.form.extra_information: - blocks: - content: - template: '@SyliusAdmin/Customer/Form/_extraInformation.html.twig' - priority: 10 - - sylius.admin.customer.form.second_column: - blocks: - content: - template: '@SyliusAdmin/Customer/Form/_secondColumn.html.twig' - priority: 10 - - sylius.admin.customer.form.account_credentials: - blocks: - content: - template: '@SyliusAdmin/Customer/Form/_accountCredentials.html.twig' - priority: 10 - - sylius.admin.dashboard.channel_switch: - blocks: - content: - template: '@SyliusAdmin/Dashboard/_channelSwitchContent.html.twig' - priority: 10 - - sylius.admin.dashboard.channel_switch_menu: - blocks: - search: - template: '@SyliusAdmin/Dashboard/ChannelSwitchMenu/_search.html.twig' - priority: 20 - channels: - template: '@SyliusAdmin/Dashboard/ChannelSwitchMenu/_channels.html.twig' - priority: 10 - - sylius.admin.product_variant.tab_inventory_content: - blocks: - content: - template: '@SyliusAdmin/ProductVariant/Tab/_inventoryContent.html.twig' - priority: 10 - - sylius.admin.product.tab_inventory_content: - blocks: - content: - template: '@SyliusAdmin/Product/Tab/_inventoryContent.html.twig' - priority: 10 - - sylius.admin.simple_product.show.details: - blocks: - content: - template: '@SyliusAdmin/Product/Show/_details.html.twig' - priority: 10 - - sylius.admin.simple_product.show.details_content: - blocks: - labels: - template: '@SyliusAdmin/Product/Show/_detailsLabels.html.twig' - priority: 20 - table: - template: '@SyliusAdmin/Product/Show/_detailsTable.html.twig' - priority: 10 - - sylius.admin.simple_product.show.taxonomy: - blocks: - content: - template: '@SyliusAdmin/Product/Show/_taxonomy.html.twig' - priority: 10 - - sylius.admin.simple_product.show.pricing: - blocks: - content: - template: '@SyliusAdmin/Product/Show/_pricing.html.twig' - priority: 10 - - sylius.admin.simple_product.show.shipping: - blocks: - content: - template: '@SyliusAdmin/Product/Show/_shipping.html.twig' - priority: 10 - - sylius.admin.simple_product.show.media: - blocks: - content: - template: '@SyliusAdmin/Product/Show/_media.html.twig' - priority: 10 - - sylius.admin.simple_product.show.more_details: - blocks: - content: - template: '@SyliusAdmin/Product/Show/_moreDetails.html.twig' - priority: 10 - - sylius.admin.simple_product.show.attributes: - blocks: - content: - template: '@SyliusAdmin/Product/Show/_attributes.html.twig' - priority: 10 - - sylius.admin.simple_product.show.associations: - blocks: - content: - template: '@SyliusAdmin/Product/Show/_associations.html.twig' - priority: 10 - - sylius.admin.configurable_product.show: - blocks: - variants: - template: '@SyliusAdmin/Product/Show/_variants.html.twig' - priority: 10 - - sylius.admin.configurable_product.show.variant_item: - blocks: - button: - template: '@SyliusAdmin/Product/Show/VariantItem/_button.html.twig' - priority: 80 - item: - template: '@SyliusAdmin/Product/Show/VariantItem/_item.html.twig' - priority: 70 - option_values: - template: '@SyliusAdmin/Product/Show/VariantItem/_optionValues.html.twig' - priority: 60 - tracking: - template: '@SyliusAdmin/Product/Show/VariantItem/_tracking.html.twig' - priority: 50 - shipping: - template: '@SyliusAdmin/Product/Show/VariantItem/_shipping.html.twig' - priority: 40 - tax_category: - template: '@SyliusAdmin/Product/Show/VariantItem/_taxCategory.html.twig' - priority: 30 - stock: - template: '@SyliusAdmin/Product/Show/VariantItem/_stock.html.twig' - priority: 20 - edit_button: - template: '@SyliusAdmin/Product/Show/VariantItem/_editButton.html.twig' - priority: 10 - - sylius.admin.configurable_product.show.variant_content: - blocks: - shipping: - template: '@SyliusAdmin/Product/Show/_variantContentShipping.html.twig' - priority: 20 - pricing: - template: '@SyliusAdmin/Product/Show/_variantContentPricing.html.twig' - priority: 10 - - sylius.admin.shipment.ship_with_tracking_code: - blocks: - content: - template: '@SyliusAdmin/Shipment/Grid/Action/_shipWithTrackingCodeContent.html.twig' - priority: 10 - - sylius.admin.shipment.grid.ship: - blocks: - content: - template: '@SyliusAdmin/Shipment/Grid/_shipContent.html.twig' - priority: 10 - - sylius.admin.shipment.partial.ship: - blocks: - content: - template: '@SyliusAdmin/Shipment/Partial/_shipContent.html.twig' - priority: 10 - - sylius.admin.shipment.show.content: - blocks: - header: - template: '@SyliusAdmin/Shipment/Show/_headerWidget.html.twig' - priority: 30 - breadcrumb: - template: '@SyliusAdmin/Shipment/Show/_breadcrumb.html.twig' - priority: 20 - shipment_units: - template: '@SyliusAdmin/Shipment/Show/_shipmentUnits.html.twig' - priority: 10 - - sylius.admin.request_password_reset.content: - blocks: - form: - template: '@SyliusAdmin/Security/RequestPasswordReset/_form.html.twig' - priority: 10 - - sylius.admin.request_password_reset.before_form: - blocks: - header: - template: "@SyliusAdmin/Security/_logo.html.twig" - priority: 20 - flashes: - template: "@SyliusUi/_flashes.html.twig" - priority: 10 - - sylius.admin.request_password_reset.form.content: - blocks: - email: - template: '@SyliusAdmin/Security/RequestPasswordReset/_email.html.twig' - priority: 20 - submit: - template: '@SyliusAdmin/Security/RequestPasswordReset/_submit.html.twig' - priority: 10 - - sylius.admin.reset_password.content: - blocks: - form: - template: '@SyliusAdmin/Security/ResetPassword/_content.html.twig' - priority: 10 - - sylius.admin.reset_password.form: - blocks: - logo: - template: '@SyliusAdmin/Security/_logo.html.twig' - priority: 20 - content: - template: '@SyliusAdmin/Security/ResetPassword/_form.html.twig' - priority: 10 - - sylius.admin.reset_password.form.content: - blocks: - passwords: - template: '@SyliusAdmin/Security/ResetPassword/Form/_passwords.html.twig' - priority: 20 - submit: - template: '@SyliusAdmin/Security/ResetPassword/Form/_submit.html.twig' - priority: 10 diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml new file mode 100644 index 0000000000..681a942e6c --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml @@ -0,0 +1,13 @@ +# This file is part of the Sylius package. +# (c) Sylius Sp. z o.o. + +sylius_ui: + events: + sylius.admin.index.body: + blocks: + sidebar: + template: '@SyliusAdmin/Shared/Crud/Common/_sidebar.html.twig' + navbar: + template: '@SyliusAdmin/Shared/Crud/Common/_navbar.html.twig' + content: + template: '@SyliusAdmin/Shared/Crud/Common/_content.html.twig' diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/index.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/index.html.twig index 771150ac7d..9a49ffb602 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/index.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/index.html.twig @@ -1,25 +1,27 @@ -{% extends '@SyliusAdmin/layout.html.twig' %} +{% extends '@SyliusAdmin/Shared/Crud/index.html.twig' %} -{% set definition = resources.definition %} -{% set data = resources.data %} -{% set event_prefix = metadata.applicationName ~ '.admin.' ~ metadata.name ~ '.index' %} +{#{% extends '@SyliusAdmin/layout.html.twig' %}#} -{% set header = configuration.vars.header|default(metadata.applicationName~'.ui.'~metadata.pluralName) %} +{#{% set definition = resources.definition %}#} +{#{% set data = resources.data %}#} +{#{% set event_prefix = metadata.applicationName ~ '.admin.' ~ metadata.name ~ '.index' %}#} -{% block title %}{{ header|trans }} {{ parent() }}{% endblock %} +{#{% set header = configuration.vars.header|default(metadata.applicationName~'.ui.'~metadata.pluralName) %}#} -{% block content %} - {{ sylius_template_event([event_prefix, 'sylius.admin.index'], _context) }} -{% endblock %} +{#{% block title %}{{ header|trans }} {{ parent() }}{% endblock %}#} -{% block stylesheets %} - {{ parent() }} +{#{% block content %}#} +{# {{ sylius_template_event([event_prefix, 'sylius.admin.index'], _context) }}#} +{#{% endblock %}#} - {{ sylius_template_event([event_prefix ~ '.stylesheets', 'sylius.admin.index.stylesheets'], { 'metadata': metadata }) }} -{% endblock %} +{#{% block stylesheets %}#} +{# {{ parent() }}#} -{% block javascripts %} - {{ parent() }} +{# {{ sylius_template_event([event_prefix ~ '.stylesheets', 'sylius.admin.index.stylesheets'], { 'metadata': metadata }) }}#} +{#{% endblock %}#} - {{ sylius_template_event([event_prefix ~ '.javascripts', 'sylius.admin.index.javascripts'], { 'metadata': metadata }) }} -{% endblock %} +{#{% block javascripts %}#} +{# {{ parent() }}#} + +{# {{ sylius_template_event([event_prefix ~ '.javascripts', 'sylius.admin.index.javascripts'], { 'metadata': metadata }) }}#} +{#{% endblock %}#} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_content.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_content.html.twig new file mode 100644 index 0000000000..6dfc34673a --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_content.html.twig @@ -0,0 +1,3 @@ +
+ {{ sylius_template_event(_context.resource_event_prefix ~ '.content', { event_prefix: _context.event_prefix, resource_event_prefix: _context.resource_event_prefix }) }} +
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_navbar.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_navbar.html.twig new file mode 100644 index 0000000000..f66cbc5846 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_navbar.html.twig @@ -0,0 +1,5 @@ +
+
+ {{ sylius_template_event(_context.event_prefix ~ '.navbar', { event_prefix: _context.event_prefix, resource_event_prefix: _context.resource_event_prefix }) }} +
+
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_sidebar.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_sidebar.html.twig new file mode 100644 index 0000000000..5e8e8ab520 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_sidebar.html.twig @@ -0,0 +1,5 @@ + diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/index.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/index.html.twig new file mode 100644 index 0000000000..ab9546bd09 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/index.html.twig @@ -0,0 +1,14 @@ +{% extends '@SyliusAdmin/Shared/Layout/base.html.twig' %} + +{% set definition = resources.definition %} +{% set data = resources.data %} +{% set event_prefix = metadata.applicationName ~ '.admin.' ~ 'index' %} +{% set resource_event_prefix = metadata.applicationName ~ '.admin.' ~ metadata.name ~ '.index' %} + +{% set header = configuration.vars.header|default(metadata.applicationName~'.ui.'~metadata.pluralName) %} + +{% block title %}{{ header|trans }} {{ parent() }}{% endblock %} + +{% block body %} + {{ sylius_template_event('sylius.admin.index.body', { event_prefix: event_prefix, resource_event_prefix: resource_event_prefix }) }} +{% endblock %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Layout/base.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Layout/base.html.twig new file mode 100644 index 0000000000..e28f16e847 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Layout/base.html.twig @@ -0,0 +1,22 @@ + + + + + + + + {% block title %}Sylius{% endblock %} + + {% block metatags %}{% endblock %} + {{ encore_entry_link_tags('admin-entry', null, 'admin') }} + {% block stylesheets %}{% endblock %} + + +
+ {% block body %}{% endblock %} +
+ +{{ encore_entry_script_tags('admin-entry', null, 'admin') }} +{% block javascript %}{% endblock %} + + From 7a84255b6deb4aa396a62ea60219f935dd5633af Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Sun, 17 Sep 2023 09:57:23 +0200 Subject: [PATCH 006/166] Add support for Twig Components in Template Events --- composer.json | 1 + config/bundles.php | 1 + rector.php | 19 ++--- .../AdminBundle/test/config/bundles.php | 1 + .../Tests/Application/config/bundles.php | 1 + .../Bundle/CoreBundle/test/config/bundles.php | 1 + .../DependencyInjection/Configuration.php | 1 + .../DependencyInjection/SyliusUiExtension.php | 3 +- .../UiBundle/Registry/TemplateBlock.php | 7 ++ .../HtmlDebugTemplateBlockRenderer.php | 59 +++++++++++----- .../HtmlDebugTemplateEventRenderer.php | 16 ++++- .../Renderer/TwigComponentBlockRenderer.php | 39 +++++++++++ .../config/services/template_event.xml | 5 ++ .../SyliusUiExtensionTest.php | 14 ++-- .../UiBundle/Tests/Functional/Kernel.php | 22 ++++++ .../Tests/Functional/TemplateEventTest.php | 23 +++++++ .../Functional/src/SomeTwigComponent.php | 39 +++++++++++ .../twigComponent/someTwigComponent.html.twig | 2 + .../templateEventsButComponent.txt.twig | 2 + src/Sylius/Bundle/UiBundle/composer.json | 1 + .../DefaultContextProviderSpec.php | 6 +- .../Registry/TemplateBlockRegistrySpec.php | 46 ++++++------- .../spec/Registry/TemplateBlockSpec.php | 27 ++++---- .../DelegatingTemplateEventRendererSpec.php | 4 +- .../HtmlDebugTemplateBlockRendererSpec.php | 43 +++++++----- .../HtmlDebugTemplateEventRendererSpec.php | 69 +++++++++++-------- .../TwigComponentBlockRendererSpec.php | 64 +++++++++++++++++ .../TwigTemplateBlockRendererSpec.php | 2 +- symfony.lock | 3 + 29 files changed, 395 insertions(+), 126 deletions(-) create mode 100644 src/Sylius/Bundle/UiBundle/Renderer/TwigComponentBlockRenderer.php create mode 100644 src/Sylius/Bundle/UiBundle/Tests/Functional/src/SomeTwigComponent.php create mode 100644 src/Sylius/Bundle/UiBundle/Tests/Functional/templates/blocks/twigComponent/someTwigComponent.html.twig create mode 100644 src/Sylius/Bundle/UiBundle/Tests/Functional/templates/templateEventsButComponent.txt.twig create mode 100644 src/Sylius/Bundle/UiBundle/spec/Renderer/TwigComponentBlockRendererSpec.php diff --git a/composer.json b/composer.json index 040547138d..85eb1d9329 100644 --- a/composer.json +++ b/composer.json @@ -131,6 +131,7 @@ "symfony/translation": "^6.3.3", "symfony/translation-contracts": "^2.5.2", "symfony/twig-bundle": "^6.3.0", + "symfony/ux-twig-component": "^2.11.2", "symfony/validator": "^6.3.4", "symfony/webpack-encore-bundle": "^1.17.1", "symfony/yaml": "^6.3.3", diff --git a/config/bundles.php b/config/bundles.php index b433583b42..359bcb430d 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -59,4 +59,5 @@ return [ SyliusLabs\DoctrineMigrationsExtraBundle\SyliusLabsDoctrineMigrationsExtraBundle::class => ['all' => true], SyliusLabs\Polyfill\Symfony\Security\Bundle\SyliusLabsPolyfillSymfonySecurityBundle::class => ['all' => true], Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true], + Symfony\UX\TwigComponent\TwigComponentBundle::class => ['all' => true], ]; diff --git a/rector.php b/rector.php index 6f399dadbd..47f27d17ab 100644 --- a/rector.php +++ b/rector.php @@ -2,21 +2,12 @@ declare(strict_types=1); -use Rector\Core\Configuration\Option; -use Rector\Php74\Rector\Closure\ClosureToArrowFunctionRector; -use Rector\Php74\Rector\Property\TypedPropertyRector; +use Rector\Config\RectorConfig; use Rector\Set\ValueObject\LevelSetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; -return static function (ContainerConfigurator $containerConfigurator): void +return static function (RectorConfig $config): void { - $containerConfigurator->import(LevelSetList::UP_TO_PHP_80); - - $parameters = $containerConfigurator->parameters(); - $parameters->set(Option::AUTO_IMPORT_NAMES, true); - $parameters->set(Option::IMPORT_SHORT_CLASSES, false); - - $services = $containerConfigurator->services(); - $services->set(TypedPropertyRector::class); - $services->set(ClosureToArrowFunctionRector::class); + $config->sets([ + LevelSetList::UP_TO_PHP_82 + ]); }; diff --git a/src/Sylius/Bundle/AdminBundle/test/config/bundles.php b/src/Sylius/Bundle/AdminBundle/test/config/bundles.php index 6d2563035c..5ca5b1789e 100644 --- a/src/Sylius/Bundle/AdminBundle/test/config/bundles.php +++ b/src/Sylius/Bundle/AdminBundle/test/config/bundles.php @@ -59,4 +59,5 @@ return [ SyliusLabs\DoctrineMigrationsExtraBundle\SyliusLabsDoctrineMigrationsExtraBundle::class => ['all' => true], Knp\Bundle\MenuBundle\KnpMenuBundle::class => ['all' => true], Sylius\Bundle\AdminBundle\SyliusAdminBundle::class => ['all' => true], + Symfony\UX\TwigComponent\TwigComponentBundle::class => ['all' => true], ]; diff --git a/src/Sylius/Bundle/ApiBundle/Tests/Application/config/bundles.php b/src/Sylius/Bundle/ApiBundle/Tests/Application/config/bundles.php index f1ad14ebee..0a46f5807a 100644 --- a/src/Sylius/Bundle/ApiBundle/Tests/Application/config/bundles.php +++ b/src/Sylius/Bundle/ApiBundle/Tests/Application/config/bundles.php @@ -62,4 +62,5 @@ return [ SyliusLabs\DoctrineMigrationsExtraBundle\SyliusLabsDoctrineMigrationsExtraBundle::class => ['all' => true], SyliusLabs\Polyfill\Symfony\Security\Bundle\SyliusLabsPolyfillSymfonySecurityBundle::class => ['all' => true], Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true], + Symfony\UX\TwigComponent\TwigComponentBundle::class => ['all' => true], ]; diff --git a/src/Sylius/Bundle/CoreBundle/test/config/bundles.php b/src/Sylius/Bundle/CoreBundle/test/config/bundles.php index b8d178f6b8..5d96f063b4 100644 --- a/src/Sylius/Bundle/CoreBundle/test/config/bundles.php +++ b/src/Sylius/Bundle/CoreBundle/test/config/bundles.php @@ -56,4 +56,5 @@ return [ Sonata\BlockBundle\SonataBlockBundle::class => ['all' => true], Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle::class => ['all' => true], SyliusLabs\DoctrineMigrationsExtraBundle\SyliusLabsDoctrineMigrationsExtraBundle::class => ['all' => true], + Symfony\UX\TwigComponent\TwigComponentBundle::class => ['all' => true], ]; diff --git a/src/Sylius/Bundle/UiBundle/DependencyInjection/Configuration.php b/src/Sylius/Bundle/UiBundle/DependencyInjection/Configuration.php index fc8ea94709..c6ff67ec55 100644 --- a/src/Sylius/Bundle/UiBundle/DependencyInjection/Configuration.php +++ b/src/Sylius/Bundle/UiBundle/DependencyInjection/Configuration.php @@ -46,6 +46,7 @@ final class Configuration implements ConfigurationInterface ->booleanNode('enabled')->defaultNull()->end() ->arrayNode('context')->addDefaultsIfNotSet()->ignoreExtraKeys(false)->end() ->scalarNode('template')->defaultNull()->end() + ->scalarNode('component')->defaultNull()->end() ->integerNode('priority')->defaultNull()->end() ; diff --git a/src/Sylius/Bundle/UiBundle/DependencyInjection/SyliusUiExtension.php b/src/Sylius/Bundle/UiBundle/DependencyInjection/SyliusUiExtension.php index e6cf08af28..56c81ed1ce 100644 --- a/src/Sylius/Bundle/UiBundle/DependencyInjection/SyliusUiExtension.php +++ b/src/Sylius/Bundle/UiBundle/DependencyInjection/SyliusUiExtension.php @@ -57,8 +57,8 @@ final class SyliusUiExtension extends Extension $blocksPriorityQueue->insert($details, $details['priority'] ?? 0); } + /** @psalm-var array{name: string, eventName: string, template: string, component: string|null, context: array, priority: int, enabled: bool} $details */ foreach ($blocksPriorityQueue->toArray() as $details) { - /** @psalm-var array{name: string, eventName: string, template: string, context: array, priority: int, enabled: bool} $details */ $blocksForEvents[$eventName][$details['name']] = new Definition(TemplateBlock::class, [ $details['name'], $details['eventName'], @@ -66,6 +66,7 @@ final class SyliusUiExtension extends Extension $details['context'], $details['priority'], $details['enabled'], + $details['component'], ]); } } diff --git a/src/Sylius/Bundle/UiBundle/Registry/TemplateBlock.php b/src/Sylius/Bundle/UiBundle/Registry/TemplateBlock.php index 256dc91f1c..96c82cdf03 100644 --- a/src/Sylius/Bundle/UiBundle/Registry/TemplateBlock.php +++ b/src/Sylius/Bundle/UiBundle/Registry/TemplateBlock.php @@ -22,6 +22,7 @@ final class TemplateBlock private ?array $context, private ?int $priority, private ?bool $enabled, + private ?string $component = null, ) { } @@ -48,6 +49,11 @@ final class TemplateBlock return $this->template; } + public function getComponent(): ?string + { + return $this->component; + } + public function getContext(): array { return $this->context ?? []; @@ -80,6 +86,7 @@ final class TemplateBlock $block->context ?? $this->context, $block->priority ?? $this->priority, $block->enabled ?? $this->enabled, + $block->component ?? $this->component, ); } } diff --git a/src/Sylius/Bundle/UiBundle/Renderer/HtmlDebugTemplateBlockRenderer.php b/src/Sylius/Bundle/UiBundle/Renderer/HtmlDebugTemplateBlockRenderer.php index 677a1ab141..a8fe4d34c6 100644 --- a/src/Sylius/Bundle/UiBundle/Renderer/HtmlDebugTemplateBlockRenderer.php +++ b/src/Sylius/Bundle/UiBundle/Renderer/HtmlDebugTemplateBlockRenderer.php @@ -23,30 +23,55 @@ final class HtmlDebugTemplateBlockRenderer implements TemplateBlockRendererInter public function render(TemplateBlock $templateBlock, array $context = []): string { - $shouldRenderHtmlDebug = strrpos($templateBlock->getTemplate(), '.html.twig') !== false; + $isTemplateBlockComponent = null !== $templateBlock->getComponent(); + $shouldRenderHtmlDebug = $isTemplateBlockComponent || strrpos($templateBlock->getTemplate(), '.html.twig') !== false; + + if (!$shouldRenderHtmlDebug) { + return $this->templateBlockRenderer->render($templateBlock, $context); + } $renderedParts = []; - if ($shouldRenderHtmlDebug) { - $renderedParts[] = sprintf( - '', - $templateBlock->getEventName(), - $templateBlock->getName(), - $templateBlock->getTemplate(), - $templateBlock->getPriority(), - ); + if ($isTemplateBlockComponent) { + $renderedParts[] = $this->getBeginBlockForComponent($templateBlock); + } else { + $renderedParts[] = $this->getBeginBlockForTemplate($templateBlock); } $renderedParts[] = $this->templateBlockRenderer->render($templateBlock, $context); - - if ($shouldRenderHtmlDebug) { - $renderedParts[] = sprintf( - '', - $templateBlock->getEventName(), - $templateBlock->getName(), - ); - } + $renderedParts[] = $this->getEndBlock($templateBlock); return implode("\n", $renderedParts); } + + private function getBeginBlockForTemplate(TemplateBlock $templateBlock): string + { + return sprintf( + '', + $templateBlock->getEventName(), + $templateBlock->getName(), + $templateBlock->getTemplate(), + $templateBlock->getPriority(), + ); + } + + private function getBeginBlockForComponent(TemplateBlock $templateBlock): string + { + return sprintf( + '', + $templateBlock->getEventName(), + $templateBlock->getName(), + $templateBlock->getComponent(), + $templateBlock->getPriority(), + ); + } + + private function getEndBlock(TemplateBlock $templateBlock): string + { + return sprintf( + '', + $templateBlock->getEventName(), + $templateBlock->getName(), + ); + } } diff --git a/src/Sylius/Bundle/UiBundle/Renderer/HtmlDebugTemplateEventRenderer.php b/src/Sylius/Bundle/UiBundle/Renderer/HtmlDebugTemplateEventRenderer.php index 273e9eca1c..74eabf46cd 100644 --- a/src/Sylius/Bundle/UiBundle/Renderer/HtmlDebugTemplateEventRenderer.php +++ b/src/Sylius/Bundle/UiBundle/Renderer/HtmlDebugTemplateEventRenderer.php @@ -54,6 +54,20 @@ final class HtmlDebugTemplateEventRenderer implements TemplateEventRendererInter */ private function shouldRenderHtmlDebug(array $templateBlocks): bool { - return count($templateBlocks) === 0 || count(array_filter($templateBlocks, static fn (TemplateBlock $templateBlock): bool => strrpos($templateBlock->getTemplate(), '.html.twig') !== false)) >= 1; + return count($templateBlocks) === 0 || $this->hasAnyBlockWithComponentOrTemplate($templateBlocks); + } + + /** + * @param array $templateBlocks + */ + private function hasAnyBlockWithComponentOrTemplate(array $templateBlocks): bool + { + foreach ($templateBlocks as $templateBlock) { + if (null !== $templateBlock->getComponent() || strrpos($templateBlock->getTemplate(), '.html.twig') !== false) { + return true; + } + } + + return false; } } diff --git a/src/Sylius/Bundle/UiBundle/Renderer/TwigComponentBlockRenderer.php b/src/Sylius/Bundle/UiBundle/Renderer/TwigComponentBlockRenderer.php new file mode 100644 index 0000000000..6ccf48433b --- /dev/null +++ b/src/Sylius/Bundle/UiBundle/Renderer/TwigComponentBlockRenderer.php @@ -0,0 +1,39 @@ + $context + */ + public function render(TemplateBlock $templateBlock, array $context = []): string + { + if (null === $templateBlock->getComponent()) { + return $this->decoratedRenderer->render($templateBlock, $context); + } + + return $this->componentRenderer->createAndRender($templateBlock->getComponent(), ['context' => $templateBlock->getContext() + $context]); + } +} diff --git a/src/Sylius/Bundle/UiBundle/Resources/config/services/template_event.xml b/src/Sylius/Bundle/UiBundle/Resources/config/services/template_event.xml index d7417506b1..02d6a12799 100644 --- a/src/Sylius/Bundle/UiBundle/Resources/config/services/template_event.xml +++ b/src/Sylius/Bundle/UiBundle/Resources/config/services/template_event.xml @@ -22,6 +22,11 @@ + + + + + diff --git a/src/Sylius/Bundle/UiBundle/Tests/DependencyInjection/SyliusUiExtensionTest.php b/src/Sylius/Bundle/UiBundle/Tests/DependencyInjection/SyliusUiExtensionTest.php index 9d66309240..f91dc8fe96 100644 --- a/src/Sylius/Bundle/UiBundle/Tests/DependencyInjection/SyliusUiExtensionTest.php +++ b/src/Sylius/Bundle/UiBundle/Tests/DependencyInjection/SyliusUiExtensionTest.php @@ -41,11 +41,11 @@ final class SyliusUiExtensionTest extends AbstractExtensionTestCase 0, [ 'first_event' => [ - 'first_block' => new Definition(TemplateBlock::class, ['first_block', 'first_event', 'first.html.twig', [], 0, true]), - 'second_block' => new Definition(TemplateBlock::class, ['second_block', 'first_event', 'second.html.twig', ['foo' => 'bar'], 0, true]), + 'first_block' => new Definition(TemplateBlock::class, ['first_block', 'first_event', 'first.html.twig', [], 0, true, null]), + 'second_block' => new Definition(TemplateBlock::class, ['second_block', 'first_event', 'second.html.twig', ['foo' => 'bar'], 0, true, null]), ], 'second_event' => [ - 'another_block' => new Definition(TemplateBlock::class, ['another_block', 'second_event', 'another.html.twig', [], 0, true]), + 'another_block' => new Definition(TemplateBlock::class, ['another_block', 'second_event', 'another.html.twig', [], 0, true, null]), ], ], ); @@ -69,10 +69,10 @@ final class SyliusUiExtensionTest extends AbstractExtensionTestCase TemplateBlockRegistryInterface::class, 0, ['event_name' => [ - 'first_block' => new Definition(TemplateBlock::class, ['first_block', 'event_name', 'first.html.twig', [], 5, true]), - 'second_block' => new Definition(TemplateBlock::class, ['second_block', 'event_name', 'second.html.twig', [], 0, true]), - 'third_block' => new Definition(TemplateBlock::class, ['third_block', 'event_name', 'third.html.twig', [], 0, true]), - 'fourth_block' => new Definition(TemplateBlock::class, ['fourth_block', 'event_name', 'fourth.html.twig', [], -5, true]), + 'first_block' => new Definition(TemplateBlock::class, ['first_block', 'event_name', 'first.html.twig', [], 5, true, null]), + 'second_block' => new Definition(TemplateBlock::class, ['second_block', 'event_name', 'second.html.twig', [], 0, true, null]), + 'third_block' => new Definition(TemplateBlock::class, ['third_block', 'event_name', 'third.html.twig', [], 0, true, null]), + 'fourth_block' => new Definition(TemplateBlock::class, ['fourth_block', 'event_name', 'fourth.html.twig', [], -5, true, null]), ]], ); } diff --git a/src/Sylius/Bundle/UiBundle/Tests/Functional/Kernel.php b/src/Sylius/Bundle/UiBundle/Tests/Functional/Kernel.php index d77d75743a..0f4a947b6e 100644 --- a/src/Sylius/Bundle/UiBundle/Tests/Functional/Kernel.php +++ b/src/Sylius/Bundle/UiBundle/Tests/Functional/Kernel.php @@ -16,12 +16,14 @@ namespace Sylius\Bundle\UiBundle\Tests\Functional; use Sonata\BlockBundle\SonataBlockBundle; use Sylius\Bundle\UiBundle\SyliusUiBundle; use Sylius\Bundle\UiBundle\Tests\Functional\src\CustomContextProvider; +use Sylius\Bundle\UiBundle\Tests\Functional\src\SomeTwigComponent; use Symfony\Bundle\FrameworkBundle\FrameworkBundle; use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait; use Symfony\Bundle\SecurityBundle\SecurityBundle; use Symfony\Bundle\TwigBundle\TwigBundle; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Kernel as HttpKernel; +use Symfony\UX\TwigComponent\TwigComponentBundle; use Symfony\WebpackEncoreBundle\WebpackEncoreBundle; final class Kernel extends HttpKernel @@ -37,6 +39,7 @@ final class Kernel extends HttpKernel new SonataBlockBundle(), new SyliusUiBundle(), new WebpackEncoreBundle(), + new TwigComponentBundle(), ]; } @@ -44,6 +47,8 @@ final class Kernel extends HttpKernel { $container->register(CustomContextProvider::class)->addTag('sylius.ui.template_event.context_provider'); + $container->register(SomeTwigComponent::class)->addTag('twig.component', ['template' => 'blocks/twigComponent/someTwigComponent.html.twig']); + $container->loadFromExtension('framework', [ 'secret' => 'S0ME_SECRET', ]); @@ -117,6 +122,23 @@ final class Kernel extends HttpKernel ], ], ], + 'template_event' => [ + 'blocks' => [ + 'block' => [ + 'component' => 'SomeTwigComponent', + ], + ], + ], + 'template_event_with_context' => [ + 'blocks' => [ + 'block' => [ + 'component' => 'SomeTwigComponent', + 'context' => [ + 'baz' => 'qux', + ], + ], + ], + ], ]]); $container->loadFromExtension('webpack_encore', [ diff --git a/src/Sylius/Bundle/UiBundle/Tests/Functional/TemplateEventTest.php b/src/Sylius/Bundle/UiBundle/Tests/Functional/TemplateEventTest.php index c9455a784e..fc0ddf6383 100644 --- a/src/Sylius/Bundle/UiBundle/Tests/Functional/TemplateEventTest.php +++ b/src/Sylius/Bundle/UiBundle/Tests/Functional/TemplateEventTest.php @@ -100,4 +100,27 @@ final class TemplateEventTest extends KernelTestCase Assert::assertSame($expectedLines, $renderedLines); } + + /** @test */ + public function it_renders_component(): void + { + $expectedLines = [ + '', + '', + 'Hello from the Twig Component :)', + 'Context: no context', + '', + '', + '', + '', + 'Hello from the Twig Component :)', + 'Context: baz=qux, foo=bar', + '', + '', + ]; + + $renderedLines = array_values(array_filter(explode("\n", $this->twig->render('templateEventsButComponent.txt.twig')))); + + Assert::assertSame($expectedLines, $renderedLines); + } } diff --git a/src/Sylius/Bundle/UiBundle/Tests/Functional/src/SomeTwigComponent.php b/src/Sylius/Bundle/UiBundle/Tests/Functional/src/SomeTwigComponent.php new file mode 100644 index 0000000000..2ddc5fa7bb --- /dev/null +++ b/src/Sylius/Bundle/UiBundle/Tests/Functional/src/SomeTwigComponent.php @@ -0,0 +1,39 @@ +context) { + return 'no context'; + } + + $result = []; + + foreach ($this->context as $key => $value) { + $result[] = $key . '=' . $value; + } + + return implode(', ', $result); + } +} diff --git a/src/Sylius/Bundle/UiBundle/Tests/Functional/templates/blocks/twigComponent/someTwigComponent.html.twig b/src/Sylius/Bundle/UiBundle/Tests/Functional/templates/blocks/twigComponent/someTwigComponent.html.twig new file mode 100644 index 0000000000..e2e7985d81 --- /dev/null +++ b/src/Sylius/Bundle/UiBundle/Tests/Functional/templates/blocks/twigComponent/someTwigComponent.html.twig @@ -0,0 +1,2 @@ +Hello from the Twig Component :) +Context: {{ contextAsString }} diff --git a/src/Sylius/Bundle/UiBundle/Tests/Functional/templates/templateEventsButComponent.txt.twig b/src/Sylius/Bundle/UiBundle/Tests/Functional/templates/templateEventsButComponent.txt.twig new file mode 100644 index 0000000000..bc0f916d20 --- /dev/null +++ b/src/Sylius/Bundle/UiBundle/Tests/Functional/templates/templateEventsButComponent.txt.twig @@ -0,0 +1,2 @@ +{{ sylius_template_event('template_event') }} +{{ sylius_template_event('template_event_with_context', { foo: 'bar' }) }} diff --git a/src/Sylius/Bundle/UiBundle/composer.json b/src/Sylius/Bundle/UiBundle/composer.json index e7570c3fef..6c5765babf 100644 --- a/src/Sylius/Bundle/UiBundle/composer.json +++ b/src/Sylius/Bundle/UiBundle/composer.json @@ -40,6 +40,7 @@ "symfony/security-core": "^6.3.3", "symfony/security-bundle": "^6.3.4", "symfony/templating": "^6.3.0", + "symfony/ux-twig-component": "^2.11.2", "symfony/webpack-encore-bundle": "^1.17.1", "laminas/laminas-stdlib": "^3.3.1" }, diff --git a/src/Sylius/Bundle/UiBundle/spec/ContextProvider/DefaultContextProviderSpec.php b/src/Sylius/Bundle/UiBundle/spec/ContextProvider/DefaultContextProviderSpec.php index ced9468556..b2fbdca261 100644 --- a/src/Sylius/Bundle/UiBundle/spec/ContextProvider/DefaultContextProviderSpec.php +++ b/src/Sylius/Bundle/UiBundle/spec/ContextProvider/DefaultContextProviderSpec.php @@ -26,7 +26,7 @@ final class DefaultContextProviderSpec extends ObjectBehavior function it_replaces_block_context_with_a_template_context(): void { - $templateBlock = new TemplateBlock('block_name', 'event_name', 'block.txt.twig', ['foo' => 'quux', 'quuz' => 'corge'], 0, true); + $templateBlock = new TemplateBlock('block_name', 'event_name', 'block.txt.twig', ['foo' => 'quux', 'quuz' => 'corge'], 0, true, null); $this ->provide(['foo' => 'bar', 'baz' => 'qux'], $templateBlock) @@ -41,12 +41,12 @@ final class DefaultContextProviderSpec extends ObjectBehavior function it_supports_all_template_blocks(): void { $this - ->supports(new TemplateBlock('block_name', 'event_name', null, null, null, null)) + ->supports(new TemplateBlock('block_name', 'event_name', null, null, null, null, null)) ->shouldReturn(true) ; $this - ->supports(new TemplateBlock('block_name', 'event_name', 'block.txt.twig', ['foo' => 'quux', 'quuz' => 'corge'], 0, true)) + ->supports(new TemplateBlock('block_name', 'event_name', 'block.txt.twig', ['foo' => 'quux', 'quuz' => 'corge'], 0, true, null)) ->shouldReturn(true) ; } diff --git a/src/Sylius/Bundle/UiBundle/spec/Registry/TemplateBlockRegistrySpec.php b/src/Sylius/Bundle/UiBundle/spec/Registry/TemplateBlockRegistrySpec.php index a4c1a74798..aad07c5dae 100644 --- a/src/Sylius/Bundle/UiBundle/spec/Registry/TemplateBlockRegistrySpec.php +++ b/src/Sylius/Bundle/UiBundle/spec/Registry/TemplateBlockRegistrySpec.php @@ -31,7 +31,7 @@ final class TemplateBlockRegistrySpec extends ObjectBehavior function it_returns_all_template_blocks(): void { - $templateBlock = new TemplateBlock('block_name', 'event', 'block.html.twig', [], 10, true); + $templateBlock = new TemplateBlock('block_name', 'event', 'block.html.twig', [], 10, true, null); $this->beConstructedWith(['event' => ['block_name' => $templateBlock]]); @@ -40,9 +40,9 @@ final class TemplateBlockRegistrySpec extends ObjectBehavior function it_returns_enabled_template_blocks_for_a_given_event(): void { - $firstTemplateBlock = new TemplateBlock('first_block', 'event', 'first.html.twig', [], 0, true); - $secondTemplateBlock = new TemplateBlock('second_block', 'event', 'second.html.twig', [], 10, false); - $thirdTemplateBlock = new TemplateBlock('third_block', 'event', 'third.html.twig', [], 50, true); + $firstTemplateBlock = new TemplateBlock('first_block', 'event', 'first.html.twig', [], 0, true, null); + $secondTemplateBlock = new TemplateBlock('second_block', 'event', 'second.html.twig', [], 10, false, null); + $thirdTemplateBlock = new TemplateBlock('third_block', 'event', 'third.html.twig', [], 50, true, null); $this->beConstructedWith([ 'event' => [ @@ -61,24 +61,24 @@ final class TemplateBlockRegistrySpec extends ObjectBehavior { $this->beConstructedWith([ 'generic_event' => ['block' => new TemplateBlock('block', 'generic_event', 'generic.html.twig', ['foo' => 'bar'], 0, true)], - 'specific_event_template' => ['block' => new TemplateBlock('block', 'specific_event_template', 'specific.html.twig', null, null, null)], - 'specific_event_context' => ['block' => new TemplateBlock('block', 'specific_event_context', null, ['other' => 'context'], null, null)], - 'specific_event_priority' => ['block' => new TemplateBlock('block', 'specific_event_priority', null, null, 10, null)], - 'specific_event_enabled' => ['block' => new TemplateBlock('block', 'specific_event_enabled', null, null, null, false)], + 'specific_event_template' => ['block' => new TemplateBlock('block', 'specific_event_template', 'specific.html.twig', null, null, null, null)], + 'specific_event_context' => ['block' => new TemplateBlock('block', 'specific_event_context', null, ['other' => 'context'], null, null, null)], + 'specific_event_priority' => ['block' => new TemplateBlock('block', 'specific_event_priority', null, null, 10, null, null)], + 'specific_event_enabled' => ['block' => new TemplateBlock('block', 'specific_event_enabled', null, null, null, false, null)], ]); $this->findEnabledForEvents(['specific_event_template', 'generic_event'])->shouldIterateLike([ - new TemplateBlock('block', 'specific_event_template', 'specific.html.twig', ['foo' => 'bar'], 0, true), + new TemplateBlock('block', 'specific_event_template', 'specific.html.twig', ['foo' => 'bar'], 0, true, null), ]); $this->findEnabledForEvents(['specific_event_context', 'generic_event'])->shouldIterateLike([ - new TemplateBlock('block', 'specific_event_context', 'generic.html.twig', ['other' => 'context'], 0, true), + new TemplateBlock('block', 'specific_event_context', 'generic.html.twig', ['other' => 'context'], 0, true, null), ]); $this->findEnabledForEvents(['specific_event_priority', 'generic_event'])->shouldIterateLike([ - new TemplateBlock('block', 'specific_event_priority', 'generic.html.twig', ['foo' => 'bar'], 10, true), + new TemplateBlock('block', 'specific_event_priority', 'generic.html.twig', ['foo' => 'bar'], 10, true, null), ]); $this->findEnabledForEvents(['specific_event_enabled', 'generic_event'])->shouldReturn([]); $this->findEnabledForEvents(['specific_event_priority', 'specific_event_template', 'generic_event'])->shouldIterateLike([ - new TemplateBlock('block', 'specific_event_priority', 'specific.html.twig', ['foo' => 'bar'], 10, true), + new TemplateBlock('block', 'specific_event_priority', 'specific.html.twig', ['foo' => 'bar'], 10, true, null), ]); } @@ -86,23 +86,23 @@ final class TemplateBlockRegistrySpec extends ObjectBehavior { $this->beConstructedWith([ 'generic_event' => [ - 'first_block' => new TemplateBlock('first_block', 'generic_event', 'generic.html.twig', ['foo' => 'bar'], 50, true), - 'third_block' => new TemplateBlock('third_block', 'generic_event', 'generic.html.twig', ['foo' => 'bar'], -10, true), - 'second_block' => new TemplateBlock('second_block', 'generic_event', 'generic.html.twig', ['foo' => 'bar'], 0, true), - 'invisible_block' => new TemplateBlock('invisible_block', 'generic_event', 'generic.html.twig', ['foo' => 'bar'], 0, false), + 'first_block' => new TemplateBlock('first_block', 'generic_event', 'generic.html.twig', ['foo' => 'bar'], 50, true, null), + 'third_block' => new TemplateBlock('third_block', 'generic_event', 'generic.html.twig', ['foo' => 'bar'], -10, true, null), + 'second_block' => new TemplateBlock('second_block', 'generic_event', 'generic.html.twig', ['foo' => 'bar'], 0, true, null), + 'invisible_block' => new TemplateBlock('invisible_block', 'generic_event', 'generic.html.twig', ['foo' => 'bar'], 0, false, null), ], 'specific_event' => [ - 'additional_block' => new TemplateBlock('additional_block', 'specific_event', 'specific.html.twig', [], 75, true), - 'second_block' => new TemplateBlock('second_block', 'specific_event', null, null, null, false), - 'third_block' => new TemplateBlock('third_block', 'specific_event', null, null, 100, null), - 'invisible_block' => new TemplateBlock('invisible_block', 'specific_event', null, [], null, null), + 'additional_block' => new TemplateBlock('additional_block', 'specific_event', 'specific.html.twig', [], 75, true, null), + 'second_block' => new TemplateBlock('second_block', 'specific_event', null, null, null, false, null), + 'third_block' => new TemplateBlock('third_block', 'specific_event', null, null, 100, null, null), + 'invisible_block' => new TemplateBlock('invisible_block', 'specific_event', null, [], null, null, null), ], ]); $this->findEnabledForEvents(['specific_event', 'generic_event'])->shouldIterateLike([ - new TemplateBlock('third_block', 'specific_event', 'generic.html.twig', ['foo' => 'bar'], 100, true), - new TemplateBlock('additional_block', 'specific_event', 'specific.html.twig', [], 75, true), - new TemplateBlock('first_block', 'generic_event', 'generic.html.twig', ['foo' => 'bar'], 50, true), + new TemplateBlock('third_block', 'specific_event', 'generic.html.twig', ['foo' => 'bar'], 100, true, null), + new TemplateBlock('additional_block', 'specific_event', 'specific.html.twig', [], 75, true, null), + new TemplateBlock('first_block', 'generic_event', 'generic.html.twig', ['foo' => 'bar'], 50, true, null), ]); } } diff --git a/src/Sylius/Bundle/UiBundle/spec/Registry/TemplateBlockSpec.php b/src/Sylius/Bundle/UiBundle/spec/Registry/TemplateBlockSpec.php index bf74737465..01679f729b 100644 --- a/src/Sylius/Bundle/UiBundle/spec/Registry/TemplateBlockSpec.php +++ b/src/Sylius/Bundle/UiBundle/spec/Registry/TemplateBlockSpec.php @@ -20,11 +20,12 @@ final class TemplateBlockSpec extends ObjectBehavior { function it_represents_a_template_block(): void { - $this->beConstructedWith('block_name', 'event_name', 'block.html.twig', ['foo' => 'bar'], 10, false); + $this->beConstructedWith('block_name', 'event_name', 'block.html.twig', ['foo' => 'bar'], 10, false, null); $this->getName()->shouldReturn('block_name'); $this->getEventName()->shouldReturn('event_name'); $this->getTemplate()->shouldReturn('block.html.twig'); + $this->getComponent()->shouldReturn(null); $this->getContext()->shouldReturn(['foo' => 'bar']); $this->getPriority()->shouldReturn(10); $this->isEnabled()->shouldReturn(false); @@ -32,39 +33,39 @@ final class TemplateBlockSpec extends ObjectBehavior function it_overwrites_a_template_block_with_an_another_template_block(): void { - $this->beConstructedWith('block_name', 'event_name', 'block.html.twig', ['foo' => 'bar'], 10, false); + $this->beConstructedWith('block_name', 'event_name', 'block.html.twig', ['foo' => 'bar'], 10, false, null); $this - ->overwriteWith(new TemplateBlock('block_name', 'specific_event_name', 'another.html.twig', null, null, null)) - ->shouldBeLike(new TemplateBlock('block_name', 'specific_event_name', 'another.html.twig', ['foo' => 'bar'], 10, false)) + ->overwriteWith(new TemplateBlock('block_name', 'specific_event_name', 'another.html.twig', null, null, null, 'some_component')) + ->shouldBeLike(new TemplateBlock('block_name', 'specific_event_name', 'another.html.twig', ['foo' => 'bar'], 10, false, 'some_component')) ; $this - ->overwriteWith(new TemplateBlock('block_name', 'specific_event_name', null, [], null, null)) - ->shouldBeLike(new TemplateBlock('block_name', 'specific_event_name', 'block.html.twig', [], 10, false)) + ->overwriteWith(new TemplateBlock('block_name', 'specific_event_name', null, [], null, null, null)) + ->shouldBeLike(new TemplateBlock('block_name', 'specific_event_name', 'block.html.twig', [], 10, false, null)) ; $this - ->overwriteWith(new TemplateBlock('block_name', 'specific_event_name', null, null, -5, null)) - ->shouldBeLike(new TemplateBlock('block_name', 'specific_event_name', 'block.html.twig', ['foo' => 'bar'], -5, false)) + ->overwriteWith(new TemplateBlock('block_name', 'specific_event_name', null, null, -5, null, null)) + ->shouldBeLike(new TemplateBlock('block_name', 'specific_event_name', 'block.html.twig', ['foo' => 'bar'], -5, false, null)) ; $this - ->overwriteWith(new TemplateBlock('block_name', 'specific_event_name', null, null, null, true)) - ->shouldBeLike(new TemplateBlock('block_name', 'specific_event_name', 'block.html.twig', ['foo' => 'bar'], 10, true)) + ->overwriteWith(new TemplateBlock('block_name', 'specific_event_name', null, null, null, true, null)) + ->shouldBeLike(new TemplateBlock('block_name', 'specific_event_name', 'block.html.twig', ['foo' => 'bar'], 10, true, null)) ; } function it_throws_an_exception_if_trying_to_overwrite_with_a_differently_named_block(): void { - $this->beConstructedWith('block_name', 'event_name', 'block.html.twig', ['foo' => 'bar'], 10, false); + $this->beConstructedWith('block_name', 'event_name', 'block.html.twig', ['foo' => 'bar'], 10, false, null); - $this->shouldThrow(\DomainException::class)->during('overwriteWith', [new TemplateBlock('different_name', 'specific_event_name', null, null, null, null)]); + $this->shouldThrow(\DomainException::class)->during('overwriteWith', [new TemplateBlock('different_name', 'specific_event_name', null, null, null, null, null)]); } function it_has_sensible_defaults(): void { - $this->beConstructedWith('block_name', 'event_name', null, null, null, null); + $this->beConstructedWith('block_name', 'event_name', null, null, null, null, null); $this->shouldThrow(\DomainException::class)->during('getTemplate'); $this->getContext()->shouldReturn([]); diff --git a/src/Sylius/Bundle/UiBundle/spec/Renderer/DelegatingTemplateEventRendererSpec.php b/src/Sylius/Bundle/UiBundle/spec/Renderer/DelegatingTemplateEventRendererSpec.php index 7e059be237..e1d080ca65 100644 --- a/src/Sylius/Bundle/UiBundle/spec/Renderer/DelegatingTemplateEventRendererSpec.php +++ b/src/Sylius/Bundle/UiBundle/spec/Renderer/DelegatingTemplateEventRendererSpec.php @@ -36,8 +36,8 @@ final class DelegatingTemplateEventRendererSpec extends ObjectBehavior TemplateBlockRegistryInterface $templateBlockRegistry, TemplateBlockRendererInterface $templateBlockRenderer, ): void { - $firstTemplateBlock = new TemplateBlock('first_block', 'best_event_ever', 'firstBlock.txt.twig', [], 0, true); - $secondTemplateBlock = new TemplateBlock('second_block', 'best_event_ever', 'secondBlock.txt.twig', [], 0, true); + $firstTemplateBlock = new TemplateBlock('first_block', 'best_event_ever', 'firstBlock.txt.twig', [], 0, true, null); + $secondTemplateBlock = new TemplateBlock('second_block', 'best_event_ever', 'secondBlock.txt.twig', [], 0, true, null); $templateBlockRegistry->findEnabledForEvents(['best_event_ever'])->willReturn([$firstTemplateBlock, $secondTemplateBlock]); diff --git a/src/Sylius/Bundle/UiBundle/spec/Renderer/HtmlDebugTemplateBlockRendererSpec.php b/src/Sylius/Bundle/UiBundle/spec/Renderer/HtmlDebugTemplateBlockRendererSpec.php index a40f4a13f6..b2a7a50ca2 100644 --- a/src/Sylius/Bundle/UiBundle/spec/Renderer/HtmlDebugTemplateBlockRendererSpec.php +++ b/src/Sylius/Bundle/UiBundle/spec/Renderer/HtmlDebugTemplateBlockRendererSpec.php @@ -14,7 +14,6 @@ declare(strict_types=1); namespace spec\Sylius\Bundle\UiBundle\Renderer; use PhpSpec\ObjectBehavior; -use Prophecy\Argument; use Sylius\Bundle\UiBundle\Registry\TemplateBlock; use Sylius\Bundle\UiBundle\Renderer\TemplateBlockRendererInterface; @@ -30,29 +29,41 @@ final class HtmlDebugTemplateBlockRendererSpec extends ObjectBehavior $this->shouldImplement(TemplateBlockRendererInterface::class); } - function it_renders_html_debug_comment_prepending_the_block_if_rendering_html_template( + function it_does_not_render_a_debug_html_comment_if_the_template_block_is_not_a_component_nor_a_twig_template( TemplateBlockRendererInterface $templateBlockRenderer, ): void { - $templateBlockRenderer->render(Argument::cetera())->willReturn('Block content'); + $templateBlock = new TemplateBlock('block_name', 'event_name', 'some_content', null, null, true, null); - $this->render( - new TemplateBlock('block_name', 'event_name', 'block.html.twig', [], 0, true), - ['foo' => 'bar'], - )->shouldReturn( - '' . "\n" . - 'Block content' . "\n" . - '', + $templateBlockRenderer->render($templateBlock, [])->willReturn('Rendered template'); + + $this->render($templateBlock, [])->shouldReturn('Rendered template'); + } + + function it_renders_a_debug_html_comment_if_the_template_block_has_a_configured_component( + TemplateBlockRendererInterface $templateBlockRenderer, + ): void { + $templateBlock = new TemplateBlock('block_name', 'event_name', 'some_content', null, null, true, 'component_name'); + + $templateBlockRenderer->render($templateBlock, [])->willReturn('Rendered template'); + + $this->render($templateBlock, [])->shouldReturn( + '' . "\n" . + 'Rendered template' . "\n" . + '' ); } - function it_does_not_render_html_debug_comment_prepending_the_block_if_rendering_non_html_template( + function it_renders_a_debug_html_comment_if_the_template_block_has_a_configured_twig_template( TemplateBlockRendererInterface $templateBlockRenderer, ): void { - $templateBlockRenderer->render(Argument::cetera())->willReturn('Block content'); + $templateBlock = new TemplateBlock('block_name', 'event_name', 'template.html.twig', [], null, true, null); - $this->render( - new TemplateBlock('block_name', 'event_name', 'block.txt.twig', [], 0, true), - ['foo' => 'bar'], - )->shouldReturn('Block content'); + $templateBlockRenderer->render($templateBlock, [])->willReturn('Rendered template'); + + $this->render($templateBlock, [])->shouldReturn( + '' . "\n" . + 'Rendered template' . "\n" . + '' + ); } } diff --git a/src/Sylius/Bundle/UiBundle/spec/Renderer/HtmlDebugTemplateEventRendererSpec.php b/src/Sylius/Bundle/UiBundle/spec/Renderer/HtmlDebugTemplateEventRendererSpec.php index 020f5b3f5d..34d626a3bc 100644 --- a/src/Sylius/Bundle/UiBundle/spec/Renderer/HtmlDebugTemplateEventRendererSpec.php +++ b/src/Sylius/Bundle/UiBundle/spec/Renderer/HtmlDebugTemplateEventRendererSpec.php @@ -14,7 +14,6 @@ declare(strict_types=1); namespace spec\Sylius\Bundle\UiBundle\Renderer; use PhpSpec\ObjectBehavior; -use Prophecy\Argument; use Sylius\Bundle\UiBundle\Registry\TemplateBlock; use Sylius\Bundle\UiBundle\Registry\TemplateBlockRegistryInterface; use Sylius\Bundle\UiBundle\Renderer\TemplateEventRendererInterface; @@ -31,51 +30,65 @@ final class HtmlDebugTemplateEventRendererSpec extends ObjectBehavior $this->shouldImplement(TemplateEventRendererInterface::class); } - function it_renders_html_debug_comment_if_at_least_one_template_is_a_html_one( + function it_does_not_render_html_debug_comments_when_there_are_no_template_blocks_with_a_defined_component_nor_template( TemplateEventRendererInterface $templateEventRenderer, - TemplateBlockRegistryInterface $templateBlockRegistry, + TemplateBlockRegistryInterface $templateBlockRegistry ): void { - $firstTemplateBlock = new TemplateBlock('first_block', 'event_block', 'firstBlock.txt.twig', [], 0, true); - $secondTemplateBlock = new TemplateBlock('second_block', 'event_block', 'secondBlock.html.twig', [], 0, true); + $templateBlockRegistry->findEnabledForEvents(['event_name'])->willReturn([ + new TemplateBlock('some_block_one', 'some_event', 'some content', null, null, true, null), + ]); - $templateBlockRegistry->findEnabledForEvents(['best_event_ever'])->willReturn([$firstTemplateBlock, $secondTemplateBlock]); + $templateEventRenderer->render(['event_name'], [])->willReturn('rendered_content'); - $templateEventRenderer->render(['best_event_ever'], ['foo' => 'bar'])->willReturn("First block\nSecond block"); + $this->render(['event_name'])->shouldReturn('rendered_content'); + } - $this->render(['best_event_ever'], ['foo' => 'bar'])->shouldReturn( - '' . "\n" . - 'First block' . "\n" . - 'Second block' . "\n" . - '', + function it_renders_html_debug_comment_when_no_template_block_passed( + TemplateEventRendererInterface $templateEventRenderer, + TemplateBlockRegistryInterface $templateBlockRegistry + ): void { + $templateBlockRegistry->findEnabledForEvents(['event_name'])->willReturn([]); + + $templateEventRenderer->render(['event_name'], [])->willReturn('rendered_content'); + + $this->render(['event_name'])->shouldReturn( + '' . "\n" . + 'rendered_content' . "\n" . + '' ); } - function it_does_not_render_html_debug_comment_if_no_html_templates_are_found( + function it_renders_html_debug_comment_when_at_least_one_block_has_a_configured_component( TemplateEventRendererInterface $templateEventRenderer, - TemplateBlockRegistryInterface $templateBlockRegistry, + TemplateBlockRegistryInterface $templateBlockRegistry ): void { - $firstTemplateBlock = new TemplateBlock('first_block', 'event_block', 'firstBlock.txt.twig', [], 0, true); - $secondTemplateBlock = new TemplateBlock('second_block', 'event_block', 'secondBlock.txt.twig', [], 0, true); + $templateBlockRegistry->findEnabledForEvents(['event_name'])->willReturn([ + new TemplateBlock('some_block_one', 'some_event', 'some content', null, null, true, 'SomeComponent'), + ]); - $templateBlockRegistry->findEnabledForEvents(['best_event_ever'])->willReturn([$firstTemplateBlock, $secondTemplateBlock]); + $templateEventRenderer->render(['event_name'], [])->willReturn('rendered_content'); - $templateEventRenderer->render(['best_event_ever'], ['foo' => 'bar'])->willReturn("First block\nSecond block"); - - $this->render(['best_event_ever'], ['foo' => 'bar'])->shouldReturn("First block\nSecond block"); + $this->render(['event_name'])->shouldReturn( + '' . "\n" . + 'rendered_content' . "\n" . + '' + ); } - function it_returns_html_debug_comment_if_no_blocks_are_found_for_an_event( + function it_renders_html_debug_comment_when_at_least_one_block_has_a_configured_twig_template( TemplateEventRendererInterface $templateEventRenderer, - TemplateBlockRegistryInterface $templateBlockRegistry, + TemplateBlockRegistryInterface $templateBlockRegistry ): void { - $templateBlockRegistry->findEnabledForEvents(['best_event_ever'])->willReturn([]); + $templateBlockRegistry->findEnabledForEvents(['event_name'])->willReturn([ + new TemplateBlock('some_block_one', 'some_event', 'some_template.html.twig', null, null, true, null), + ]); - $templateEventRenderer->render(Argument::cetera())->willReturn(''); + $templateEventRenderer->render(['event_name'], [])->willReturn('rendered_content'); - $this->render(['best_event_ever'])->shouldReturn( - '' . "\n" . - "\n" . - '', + $this->render(['event_name'])->shouldReturn( + '' . "\n" . + 'rendered_content' . "\n" . + '' ); } } diff --git a/src/Sylius/Bundle/UiBundle/spec/Renderer/TwigComponentBlockRendererSpec.php b/src/Sylius/Bundle/UiBundle/spec/Renderer/TwigComponentBlockRendererSpec.php new file mode 100644 index 0000000000..67c9b23678 --- /dev/null +++ b/src/Sylius/Bundle/UiBundle/spec/Renderer/TwigComponentBlockRendererSpec.php @@ -0,0 +1,64 @@ +beConstructedWith($decoratedRenderer, $componentRenderer); + } + + function it_invokes_decorated_renderer_when_no_component_is_set( + TemplateBlockRendererInterface $decoratedRenderer, + ): void { + $someTemplateBlock = new TemplateBlock( + 'some_name', + 'some_event_name', + 'some_template', + ['some' => 'context'], + 0, + true, + null, + ); + $decoratedRenderer->render($someTemplateBlock, ['some' => 'context'])->shouldBeCalled(); + + $this->render($someTemplateBlock, ['some' => 'context']); + } + + function it_renders_a_component_when_component_is_set( + ComponentRendererInterface $componentRenderer, + ): void { + $someTemplateBlock = new TemplateBlock( + 'some_name', + 'some_event_name', + 'some_template', + ['another' => 'value'], + 0, + true, + 'some_component', + ); + $componentRenderer + ->createAndRender('some_component', ['context' => ['another' => 'value', 'some' => 'value']]) + ->willReturn('some_rendered_component') + ; + + $this->render($someTemplateBlock, ['some' => 'value'])->shouldReturn('some_rendered_component'); + } +} diff --git a/src/Sylius/Bundle/UiBundle/spec/Renderer/TwigTemplateBlockRendererSpec.php b/src/Sylius/Bundle/UiBundle/spec/Renderer/TwigTemplateBlockRendererSpec.php index e377111abd..57b504e67f 100644 --- a/src/Sylius/Bundle/UiBundle/spec/Renderer/TwigTemplateBlockRendererSpec.php +++ b/src/Sylius/Bundle/UiBundle/spec/Renderer/TwigTemplateBlockRendererSpec.php @@ -43,7 +43,7 @@ final class TwigTemplateBlockRendererSpec extends ObjectBehavior ContextProviderInterface $firstContextProvider, ContextProviderInterface $secondContextProvider, ): void { - $templateBlock = new TemplateBlock('block_name', 'event_name', 'block.txt.twig', ['sample' => 'Hi', 'switch' => true], 0, true); + $templateBlock = new TemplateBlock('block_name', 'event_name', 'block.txt.twig', ['sample' => 'Hi', 'switch' => true], 0, true, null); $twig->render('block.txt.twig', ['sample' => 'Hello', 'switch' => true])->willReturn('Block content'); diff --git a/symfony.lock b/symfony.lock index bd5a114ac4..8b30d00909 100644 --- a/symfony.lock +++ b/symfony.lock @@ -882,6 +882,9 @@ "templates/base.html.twig" ] }, + "symfony/ux-twig-component": { + "version": "v2.11.2" + }, "symfony/validator": { "version": "4.3", "recipe": { From e33eb4d94fd1ea387dcba855f23ef7e7c23e1feb Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Fri, 22 Sep 2023 10:56:29 +0200 Subject: [PATCH 007/166] Add navbar notifications button --- .../Resources/config/app/template_events.yaml | 10 + .../AdminBundle/Resources/config/services.xml | 1 + .../config/services/twig_component.xml | 18 ++ .../Components/Navbar/notifications.html.twig | 53 ++++ .../Shared/Components/Navbar/user.html.twig | 46 ++++ .../Crud/Common/Navbar/_items.html.twig | 3 + .../Shared/Crud/Common/Navbar/_menu.html.twig | 3 + .../views/Shared/Helper/avatar.html.twig | 10 + .../views/Shared/Helper/button.html.twig | 98 ++++++++ .../views/Shared/Helper/dropdown.html.twig | 55 ++++ .../views/Shared/Helper/icon.html.twig | 235 ++++++++++++++++++ .../Shared/Navbar/NotificationsComponent.php | 28 +++ 12 files changed, 560 insertions(+) create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/config/services/twig_component.xml create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Components/Navbar/notifications.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Components/Navbar/user.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/_items.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/_menu.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/avatar.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/button.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/dropdown.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/icon.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/TwigComponent/Shared/Navbar/NotificationsComponent.php diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml index 681a942e6c..dbac38fc60 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml @@ -11,3 +11,13 @@ sylius_ui: template: '@SyliusAdmin/Shared/Crud/Common/_navbar.html.twig' content: template: '@SyliusAdmin/Shared/Crud/Common/_content.html.twig' + sylius.admin.index.navbar: + blocks: + items: + template: '@SyliusAdmin/Shared/Crud/Common/Navbar/_items.html.twig' + menu: + template: '@SyliusAdmin/Shared/Crud/Common/Navbar/_menu.html.twig' + sylius.admin.index.navbar.items: + blocks: + notifications: + component: 'SyliusAdminNavbarNotifications' diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/services.xml b/src/Sylius/Bundle/AdminBundle/Resources/config/services.xml index 1430fe51c2..bdc9ce558e 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/services.xml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/services.xml @@ -19,6 +19,7 @@ + diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/services/twig_component.xml b/src/Sylius/Bundle/AdminBundle/Resources/config/services/twig_component.xml new file mode 100644 index 0000000000..66fe71df42 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/services/twig_component.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Components/Navbar/notifications.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Components/Navbar/notifications.html.twig new file mode 100644 index 0000000000..ac13de8832 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Components/Navbar/notifications.html.twig @@ -0,0 +1,53 @@ +{# Rendered by \Sylius\Bundle\AdminBundle\TwigComponent\Shared\Navbar\NotificationsComponent #} + +{% import '@SyliusAdmin/Shared/Helper/dropdown.html.twig' as dropdown %} +{% from '@SyliusAdmin/Shared/Helper/icon.html.twig' import icon %} + +
+ {% set dropdown_trigger %} + {% if notifications %} + + {{ icon({ icon: 'bell' }) }} + + + {% else %} +
+ {{ icon({ icon: 'bell' }) }} +
+ {% endif %} + {% endset %} + + {% set dropdown_content %} +
+ {% if notifications is empty %} +
+

{{ 'sylius.ui.no_new_notifications'|trans }}

+
+ {% else %} +
+ {% for notification in notifications %} +
+
+
+ +
+
+
+ {{ notification.text }} +
+
+
+
+ {% endfor %} +
+ {% endif %} +
+ {% endset %} + + {{ dropdown.default({ + class: 'dropdown-menu-card', + customTrigger: dropdown_trigger, + content: dropdown_content, + direction: 'down-end' + }) }} +
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Components/Navbar/user.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Components/Navbar/user.html.twig new file mode 100644 index 0000000000..27cd447bb8 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Components/Navbar/user.html.twig @@ -0,0 +1,46 @@ +{% import '@SyliusAdmin/Shared/Helper/avatar.html.twig' as avatar %} +{% import '@SyliusAdmin/Shared/Helper/dropdown.html.twig' as dropdown %} + +{% set dropdown_trigger %} +
+ {% set avatarPath = user.avatar.path|imagine_filter('sylius_admin_admin_user_avatar_thumbnail') %} + {{ avatar.small(avatarPath) }} +
+
Hello
+
{{ user.firstName }}
+
+
+{% endset %} + +{# TODO: Consider moving it to a separate method or create a Twig Component from it #} +{% set menu = [ + { + "title": "My account", + "url": path('sylius_admin_admin_user_update', {'id': user.id}), + "icon": "user", + }, + { + "title": "Logout", + "url": path('sylius_admin_logout'), + "icon": "logout", + }, + { + "type": "divider" + }, + { + "title": "Documentation", + "url": "https://docs.sylius.com", + "class":"small text-muted" + }, + { + "title": "Join Slack", + "url": "https://sylius.com/slack", + "class": "small text-muted" + }, + { + "title": "Report an issue", + "url": "https://github.com/Sylius/Sylius/issues", + "class": "small text-muted" + }, +] %} +{{ dropdown.list({ customTrigger: dropdown_trigger, direction: 'down-end' }, menu) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/_items.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/_items.html.twig new file mode 100644 index 0000000000..c9c167242b --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/_items.html.twig @@ -0,0 +1,3 @@ +
+ {{ sylius_template_event(_context.event_prefix ~ '.navbar.items', { event_prefix: _context.event_prefix, resource_event_prefix: _context.resource_event_prefix }) }} +
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/_menu.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/_menu.html.twig new file mode 100644 index 0000000000..f16ff57c33 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/_menu.html.twig @@ -0,0 +1,3 @@ + diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/avatar.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/avatar.html.twig new file mode 100644 index 0000000000..c6e15a70bc --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/avatar.html.twig @@ -0,0 +1,10 @@ +{% macro default(img, content, class) %} + + {{ content ? content }} + +{% endmacro %} + +{% macro small(img, content, class) %} + {% import _self as _ %} + {{ _.default(img, content, 'avatar-sm ' ~ class) }} +{% endmacro %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/button.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/button.html.twig new file mode 100644 index 0000000000..2bb4bdd533 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/button.html.twig @@ -0,0 +1,98 @@ +{% from '@SyliusAdmin/Shared/Helper/icon.html.twig' import icon as i %} + +{% macro default(params = {}) %} + {% set p = { + attr: null, + class: null, + text: "Button", + disabled: false, + dropdown: false, + icon: null, + iconOnly: false, + id: null, + size: null, + type: "button", + url: null, + }|merge(params) %} + + {% set buttonClass = 'btn' ~ + (p.class ? ' ' ~ p.class : '') ~ + (p.disabled ? ' disabled' : '') ~ + (p.dropdown ? ' dropdown-toggle' : '') ~ + (p.iconOnly ? ' btn-icon' : '') ~ + (p.size == 'large' ? ' btn-lg' : '') ~ + (p.size == 'small' ? ' btn-sm' : '') %} + + {% if p.url %} + + {{ p.icon ? i({ icon: p.icon }) }} + {{ not p.iconOnly ? p.text }} + + {% else %} + + {% endif %} +{% endmacro %} + +{% macro primary(params = {}) %} + {% import _self as _ %} + {% set params = { + class: null, + }|merge(params) %} + + {% set newParams = params|merge({ class: 'btn-primary ' ~ params.class }) %} + {{ _.default(newParams) }} +{% endmacro %} + +{% macro delete(params = {}) %} + {% import _self as _ %} + {% set params = { + class: null, + }|merge(params) %} + + {% set newParams = { text: 'Delete' }|merge(params)|merge({ class: 'btn btn-ghost-danger ' ~ params.class }) %} + {{ _.default(newParams) }} +{% endmacro %} + +{% macro create(params = {}) %} + {% import _self as _ %} + {% set params = { + type: 'submit', + text: 'sylius.ui.create'|trans, + }|merge(params) %} + + {{ _.primary(params) }} +{% endmacro %} + +{% macro update(params = {}) %} + {% import _self as _ %} + {% set params = { + type: 'submit', + text: 'sylius.ui.save_changes'|trans, + }|merge(params) %} + + {{ _.primary(params) }} +{% endmacro %} + +{% macro cancel(params = {}) %} + {% import _self as _ %} + {% set params = { + class: null, + text: 'sylius.ui.cancel'|trans, + url: app.request.headers.get('referer'), + }|merge(params)%} + + {{ _.default(params) }} +{% endmacro %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/dropdown.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/dropdown.html.twig new file mode 100644 index 0000000000..7d14e59757 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/dropdown.html.twig @@ -0,0 +1,55 @@ +{% macro default(params) %} + {% import '@SyliusAdmin/Shared/Helper/button.html.twig' as button %} + {% set p = { + button: {}, + class: null, + content: null, + customTrigger: null, + direction: 'down' + }|merge(params) %} + + {% if p.direction == 'down' %}{% set drop = '' %}{% endif %} + {% if p.direction == 'down-end' %}{% set drop = ' dropdown-menu-end' %}{% endif %} + +
+ {% if p.customTrigger %} +
{{ p.customTrigger }}
+ {% else %} + {{ button.default(p.button|merge({ dropdown: true })) }} + {% endif %} + +
+ {{ p.content }} +
+
+{% endmacro %} + +{% macro list(params, items) %} + {% from '@SyliusAdmin/Shared/Helper/icon.html.twig' import icon %} + {% import _self as _ %} + + {% set content %} + {% for item in items %} + {% set item = { + type: null, + class: null, + icon: null + }|merge(item) %} + + {% if item.type == 'header' %} + {{ item.title }} + {% elseif item.type == 'divider' %} +
+ {% else %} + {% set extra_class = item.class ? ' ' ~ item.class %} + + {{ item.icon ? icon({ icon: item.icon, class: 'icon dropdown-item-icon icon-tabler' ~ extra_class }) }} + {{ item.title }} + + {% endif %} + {% endfor %} + {% endset %} + + {% set newParams = params|merge({ content: content }) %} + {{ _.default(newParams) }} +{% endmacro %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/icon.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/icon.html.twig new file mode 100644 index 0000000000..f05fb27beb --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/icon.html.twig @@ -0,0 +1,235 @@ +{% macro icon(params) %} + {% set icon = params.icon %} + {% set class = params.class|default('icon icon-tabler') %} + {% set width = params.width|default(24) %} + {% set height = params.height|default(24) %} + {% set stroke = params.stroke|default(2) %} + {% set strokeColor = params.strokeColor|default('currentColor') %} + {% set fill = params.fill|default('none') %} + + + {% if icon == 'search' %} + + + + {% endif %} + + {% if icon == 'bell' %} + + + + {% endif %} + + {% if icon == 'dashboard' %} + + + + + {% endif %} + + {% if icon == 'list-details' %} + + + + + + + + {% endif %} + + {% if icon == 'shopping-bag' %} + + + + {% endif %} + + {% if icon == 'user' %} + + + + {% endif %} + + {% if icon == 'users' %} + + + + + + {% endif %} + + {% if icon == 'percentage' %} + + + + + {% endif %} + + {% if icon == 'payment' %} + + + + + + {% endif %} + + {% if icon == 'adjustments' %} + + + + + + + + + + + {% endif %} + + {% if icon == 'plus' %} + + + + {% endif %} + + {% if icon == 'chevron-up' %} + + + {% endif %} + + {% if icon == 'chevron-down' %} + + + {% endif %} + + {% if icon == 'chevron-left' %} + + + {% endif %} + + {% if icon == 'chevron-right' %} + + + {% endif %} + + {% if icon == 'pencil' %} + + + + {% endif %} + + {% if icon == 'eye' %} + + + + {% endif %} + + {% if icon == 'trash-x' %} + + + + + + {% endif %} + + {% if icon == 'arrow-up-right' %} + + + + {% endif %} + + {% if icon == 'circle-check' %} + + + + {% endif %} + + {% if icon == 'info-circle' %} + + + + + {% endif %} + + {% if icon == 'exclamation-circle' %} + + + + + {% endif %} + + {% if icon == 'check' %} + + + {% endif %} + + {% if icon == 'x' %} + + + + {% endif %} + + {% if icon == 'history' %} + + + + {% endif %} + + {% if icon == 'send' %} + + + + {% endif %} + + {% if icon == 'spy' %} + + + + + + + {% endif %} + + {% if icon == 'coins' %} + + + + + + + {% endif %} + + {% if icon == 'slash' %} + + + {% endif %} + + {% if icon == 'external-link' %} + + + + + {% endif %} + + {% if icon == 'logout' %} + + + + + {% endif %} + + {% if icon == 'selector' %} + + + + {% endif %} + +{% endmacro %} diff --git a/src/Sylius/Bundle/AdminBundle/TwigComponent/Shared/Navbar/NotificationsComponent.php b/src/Sylius/Bundle/AdminBundle/TwigComponent/Shared/Navbar/NotificationsComponent.php new file mode 100644 index 0000000000..c49fbb86dc --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/TwigComponent/Shared/Navbar/NotificationsComponent.php @@ -0,0 +1,28 @@ + + */ + #[ExposeInTemplate] + public function getNotifications(): array + { + return []; + } +} From 92fe99709121e1f56ebc2c0f065d51f5c65ba468 Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Fri, 22 Sep 2023 11:25:35 +0200 Subject: [PATCH 008/166] Add navbar user dropdown --- .../Resources/assets/styles/_navbar.scss | 14 ++++ .../Resources/assets/styles/main.scss | 2 + .../Resources/config/app/template_events.yaml | 2 + .../config/services/twig_component.xml | 8 ++ .../Shared/Components/Navbar/user.html.twig | 55 ++++---------- .../Crud/Common/Navbar/_items.html.twig | 2 +- .../Shared/Navbar/UserDropdown.php | 74 +++++++++++++++++++ .../Resources/translations/messages.en.yml | 1 + 8 files changed, 115 insertions(+), 43 deletions(-) create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_navbar.scss create mode 100644 src/Sylius/Bundle/AdminBundle/TwigComponent/Shared/Navbar/UserDropdown.php diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_navbar.scss b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_navbar.scss new file mode 100644 index 0000000000..69e280c3d9 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_navbar.scss @@ -0,0 +1,14 @@ +/*! + * This file is part of the Sylius package. + * + * (c) Sylius Sp. z o.o. + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +.sylius { + &.navbar-nav { + gap: 0.5rem; + } +} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/main.scss b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/main.scss index 4e3dad47ae..f6bbd130d0 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/main.scss +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/main.scss @@ -21,3 +21,5 @@ body { font-family: "Inter", sans-serif; font-feature-settings: "cv03", "cv04", "cv11"; } + +@import "navbar"; diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml index dbac38fc60..838ed8005b 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml @@ -21,3 +21,5 @@ sylius_ui: blocks: notifications: component: 'SyliusAdminNavbarNotifications' + user_dropdown: + component: 'SyliusAdminUserDropdown' diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/services/twig_component.xml b/src/Sylius/Bundle/AdminBundle/Resources/config/services/twig_component.xml index 66fe71df42..0913d645c0 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/services/twig_component.xml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/services/twig_component.xml @@ -14,5 +14,13 @@ + + + + + + + + diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Components/Navbar/user.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Components/Navbar/user.html.twig index 27cd447bb8..f87171c454 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Components/Navbar/user.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Components/Navbar/user.html.twig @@ -1,46 +1,17 @@ {% import '@SyliusAdmin/Shared/Helper/avatar.html.twig' as avatar %} {% import '@SyliusAdmin/Shared/Helper/dropdown.html.twig' as dropdown %} -{% set dropdown_trigger %} -
- {% set avatarPath = user.avatar.path|imagine_filter('sylius_admin_admin_user_avatar_thumbnail') %} - {{ avatar.small(avatarPath) }} -
-
Hello
-
{{ user.firstName }}
-
-
-{% endset %} +
+ {% set dropdown_trigger %} +
+ {% set avatarPath = user.avatar.path|imagine_filter('sylius_admin_admin_user_avatar_thumbnail') %} + {{ avatar.small(avatarPath) }} +
+
Hello
+
{{ user.firstName }}
+
+
+ {% endset %} -{# TODO: Consider moving it to a separate method or create a Twig Component from it #} -{% set menu = [ - { - "title": "My account", - "url": path('sylius_admin_admin_user_update', {'id': user.id}), - "icon": "user", - }, - { - "title": "Logout", - "url": path('sylius_admin_logout'), - "icon": "logout", - }, - { - "type": "divider" - }, - { - "title": "Documentation", - "url": "https://docs.sylius.com", - "class":"small text-muted" - }, - { - "title": "Join Slack", - "url": "https://sylius.com/slack", - "class": "small text-muted" - }, - { - "title": "Report an issue", - "url": "https://github.com/Sylius/Sylius/issues", - "class": "small text-muted" - }, -] %} -{{ dropdown.list({ customTrigger: dropdown_trigger, direction: 'down-end' }, menu) }} + {{ dropdown.list({ customTrigger: dropdown_trigger, direction: 'down-end' }, menuElements) }} +
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/_items.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/_items.html.twig index c9c167242b..c68b1b3ba2 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/_items.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/_items.html.twig @@ -1,3 +1,3 @@ -
+
{{ sylius_template_event(_context.event_prefix ~ '.navbar.items', { event_prefix: _context.event_prefix, resource_event_prefix: _context.resource_event_prefix }) }}
diff --git a/src/Sylius/Bundle/AdminBundle/TwigComponent/Shared/Navbar/UserDropdown.php b/src/Sylius/Bundle/AdminBundle/TwigComponent/Shared/Navbar/UserDropdown.php new file mode 100644 index 0000000000..5a4b987e47 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/TwigComponent/Shared/Navbar/UserDropdown.php @@ -0,0 +1,74 @@ +security->getUser(); + } + + /** + * @return array + */ + #[ExposeInTemplate] + public function getMenuElements(): array + { + return [ + [ + 'title' => $this->translator->trans('sylius.ui.my_account'), + 'url' => $this->urlGenerator->generate('sylius_admin_admin_user_update', ['id' => 1]), + 'icon' => 'user', + ], + [ + 'title' => $this->translator->trans('sylius.ui.logout'), + 'url' => $this->urlGenerator->generate('sylius_admin_logout'), + 'icon' => 'logout', + ], + [ + 'type' => 'divider' + ], + [ + 'title' => $this->translator->trans('sylius.ui.documentation'), + 'url' => 'https://docs.sylius.com', + 'class' => 'small text-muted', + ], + [ + 'title' => $this->translator->trans('sylius.ui.join_slack'), + 'url' => 'https://sylius.com/slack', + 'class' => 'small text-muted', + ], + [ + 'title' => $this->translator->trans('sylius.ui.report_an_issue'), + 'url' => 'https://github.com/Sylius/Sylius/issues', + 'class' => 'small text-muted', + ], + ]; + } +} diff --git a/src/Sylius/Bundle/UiBundle/Resources/translations/messages.en.yml b/src/Sylius/Bundle/UiBundle/Resources/translations/messages.en.yml index 246035b5f6..90fd0d620c 100644 --- a/src/Sylius/Bundle/UiBundle/Resources/translations/messages.en.yml +++ b/src/Sylius/Bundle/UiBundle/Resources/translations/messages.en.yml @@ -718,6 +718,7 @@ sylius: remember_me: 'Remember me' remove_attribute: 'Remove attribute' repeat_new_password: 'Repeat new password' + report_an_issue: 'Report an issue' report_details: 'Report details' report_it: 'Report it' reports: 'Reports' From 8e9afe4dec731969dd56182a6b2af9699bed1e53 Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Fri, 22 Sep 2023 11:32:34 +0200 Subject: [PATCH 009/166] Improve passing event_prefix and resource_event_prefix between blocks --- .../AdminBundle/Resources/config/app/template_events.yaml | 4 ++-- .../views/Shared/Crud/Common/Navbar/_items.html.twig | 5 ++++- .../views/Shared/Crud/Common/Navbar/_menu.html.twig | 5 ++++- .../Resources/views/Shared/Crud/Common/_content.html.twig | 5 ++++- .../Resources/views/Shared/Crud/Common/_navbar.html.twig | 5 ++++- .../Resources/views/Shared/Crud/Common/_sidebar.html.twig | 5 ++++- .../AdminBundle/Resources/views/Shared/Crud/index.html.twig | 6 +++--- 7 files changed, 25 insertions(+), 10 deletions(-) diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml index 838ed8005b..08a9cb109c 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml @@ -11,13 +11,13 @@ sylius_ui: template: '@SyliusAdmin/Shared/Crud/Common/_navbar.html.twig' content: template: '@SyliusAdmin/Shared/Crud/Common/_content.html.twig' - sylius.admin.index.navbar: + sylius.admin.index.body.navbar: blocks: items: template: '@SyliusAdmin/Shared/Crud/Common/Navbar/_items.html.twig' menu: template: '@SyliusAdmin/Shared/Crud/Common/Navbar/_menu.html.twig' - sylius.admin.index.navbar.items: + sylius.admin.index.body.navbar.items: blocks: notifications: component: 'SyliusAdminNavbarNotifications' diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/_items.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/_items.html.twig index c68b1b3ba2..8de7ac8c17 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/_items.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/_items.html.twig @@ -1,3 +1,6 @@ +{% set event_name = _context.event_prefix ~ '.items' %} +{% set resource_event_name = _context.resource_event_prefix ~ '.items' %} +
- {{ sylius_template_event(_context.event_prefix ~ '.navbar.items', { event_prefix: _context.event_prefix, resource_event_prefix: _context.resource_event_prefix }) }} + {{ sylius_template_event(event_name, { event_prefix: event_name, resource_event_prefix: resource_event_name }) }}
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/_menu.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/_menu.html.twig index f16ff57c33..bf76d5e098 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/_menu.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/_menu.html.twig @@ -1,3 +1,6 @@ +{% set event_name = _context.event_prefix ~ '.menu' %} +{% set resource_event_name = _context.resource_event_prefix ~ '.menu' %} + diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_content.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_content.html.twig index 6dfc34673a..71450a8907 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_content.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_content.html.twig @@ -1,3 +1,6 @@ +{% set event_name = _context.event_prefix ~ '.content' %} +{% set resource_event_name = _context.resource_event_prefix ~ '.content' %} +
- {{ sylius_template_event(_context.resource_event_prefix ~ '.content', { event_prefix: _context.event_prefix, resource_event_prefix: _context.resource_event_prefix }) }} + {{ sylius_template_event(event_name, { event_prefix: event_name, resource_event_prefix: resource_event_name }) }}
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_navbar.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_navbar.html.twig index f66cbc5846..d0692672d5 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_navbar.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_navbar.html.twig @@ -1,5 +1,8 @@ +{% set event_name = _context.event_prefix ~ '.navbar' %} +{% set resource_event_name = _context.resource_event_prefix ~ '.navbar' %} +
- {{ sylius_template_event(_context.event_prefix ~ '.navbar', { event_prefix: _context.event_prefix, resource_event_prefix: _context.resource_event_prefix }) }} + {{ sylius_template_event(event_name, { event_prefix: event_name, resource_event_prefix: resource_event_name }) }}
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_sidebar.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_sidebar.html.twig index 5e8e8ab520..dfd442ee8d 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_sidebar.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_sidebar.html.twig @@ -1,5 +1,8 @@ +{% set event_name = _context.event_prefix ~ '.sidebar' %} +{% set resource_event_name = _context.resource_event_prefix ~ '.sidebar' %} + diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/index.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/index.html.twig index ab9546bd09..0397a89a87 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/index.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/index.html.twig @@ -2,13 +2,13 @@ {% set definition = resources.definition %} {% set data = resources.data %} -{% set event_prefix = metadata.applicationName ~ '.admin.' ~ 'index' %} -{% set resource_event_prefix = metadata.applicationName ~ '.admin.' ~ metadata.name ~ '.index' %} +{% set event_name = metadata.applicationName ~ '.admin.' ~ 'index.body' %} +{% set resource_event_name = metadata.applicationName ~ '.admin.' ~ metadata.name ~ '.index.body' %} {% set header = configuration.vars.header|default(metadata.applicationName~'.ui.'~metadata.pluralName) %} {% block title %}{{ header|trans }} {{ parent() }}{% endblock %} {% block body %} - {{ sylius_template_event('sylius.admin.index.body', { event_prefix: event_prefix, resource_event_prefix: resource_event_prefix }) }} + {{ sylius_template_event(event_name, { event_prefix: event_name, resource_event_prefix: resource_event_name }) }} {% endblock %} From 79625f2798fa2f103b51cd1a1457bd842cf88826 Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Fri, 22 Sep 2023 11:50:56 +0200 Subject: [PATCH 010/166] Add a mocked searchbar --- .../Resources/config/app/template_events.yaml | 4 ++++ .../Shared/Crud/Common/Navbar/Menu/_search.html.twig | 12 ++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/Menu/_search.html.twig diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml index 08a9cb109c..34f7855324 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml @@ -23,3 +23,7 @@ sylius_ui: component: 'SyliusAdminNavbarNotifications' user_dropdown: component: 'SyliusAdminUserDropdown' + sylius.admin.index.body.navbar.menu: + blocks: + search: + template: '@SyliusAdmin/Shared/Crud/Common/Navbar/Menu/_search.html.twig' diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/Menu/_search.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/Menu/_search.html.twig new file mode 100644 index 0000000000..71b54aa5c6 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/Menu/_search.html.twig @@ -0,0 +1,12 @@ +
+
+ + + + + + + + +
+
From ec7887327d5d92eed7bf944aa65655a8e3700d60 Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Fri, 22 Sep 2023 11:53:59 +0200 Subject: [PATCH 011/166] Rename common template events --- .../AdminBundle/Resources/config/app/template_events.yaml | 6 +++--- .../views/Shared/Crud/Common/Navbar/_items.html.twig | 3 +-- .../views/Shared/Crud/Common/Navbar/_menu.html.twig | 3 +-- .../Resources/views/Shared/Crud/Common/_navbar.html.twig | 5 ++--- .../Resources/views/Shared/Crud/Common/_sidebar.html.twig | 5 ++--- 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml index 34f7855324..e2bdc8105f 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml @@ -11,19 +11,19 @@ sylius_ui: template: '@SyliusAdmin/Shared/Crud/Common/_navbar.html.twig' content: template: '@SyliusAdmin/Shared/Crud/Common/_content.html.twig' - sylius.admin.index.body.navbar: + sylius.admin.common.navbar: blocks: items: template: '@SyliusAdmin/Shared/Crud/Common/Navbar/_items.html.twig' menu: template: '@SyliusAdmin/Shared/Crud/Common/Navbar/_menu.html.twig' - sylius.admin.index.body.navbar.items: + sylius.admin.common.navbar.items: blocks: notifications: component: 'SyliusAdminNavbarNotifications' user_dropdown: component: 'SyliusAdminUserDropdown' - sylius.admin.index.body.navbar.menu: + sylius.admin.common.navbar.menu: blocks: search: template: '@SyliusAdmin/Shared/Crud/Common/Navbar/Menu/_search.html.twig' diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/_items.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/_items.html.twig index 8de7ac8c17..77d7593d01 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/_items.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/_items.html.twig @@ -1,6 +1,5 @@ {% set event_name = _context.event_prefix ~ '.items' %} -{% set resource_event_name = _context.resource_event_prefix ~ '.items' %}
- {{ sylius_template_event(event_name, { event_prefix: event_name, resource_event_prefix: resource_event_name }) }} + {{ sylius_template_event(event_name, { event_prefix: event_name }) }}
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/_menu.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/_menu.html.twig index bf76d5e098..bf7fd40662 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/_menu.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/_menu.html.twig @@ -1,6 +1,5 @@ {% set event_name = _context.event_prefix ~ '.menu' %} -{% set resource_event_name = _context.resource_event_prefix ~ '.menu' %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_navbar.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_navbar.html.twig index d0692672d5..47a006ddc6 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_navbar.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_navbar.html.twig @@ -1,8 +1,7 @@ -{% set event_name = _context.event_prefix ~ '.navbar' %} -{% set resource_event_name = _context.resource_event_prefix ~ '.navbar' %} +{% set event_name = 'sylius.admin.common.navbar' %}
- {{ sylius_template_event(event_name, { event_prefix: event_name, resource_event_prefix: resource_event_name }) }} + {{ sylius_template_event(event_name, { event_prefix: event_name }) }}
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_sidebar.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_sidebar.html.twig index dfd442ee8d..85e866ff17 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_sidebar.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_sidebar.html.twig @@ -1,8 +1,7 @@ -{% set event_name = _context.event_prefix ~ '.sidebar' %} -{% set resource_event_name = _context.resource_event_prefix ~ '.sidebar' %} +{% set event_name = 'sylius.admin.common.sidebar' %} From dfb2ffae12654d9b1764fbbf7c9c20926d76601b Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Fri, 22 Sep 2023 12:11:53 +0200 Subject: [PATCH 012/166] Bump node's version for JS workflow --- .github/workflows/ci_e2e-mysql.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci_e2e-mysql.yaml b/.github/workflows/ci_e2e-mysql.yaml index 73599a5e42..0f0d636f1f 100644 --- a/.github/workflows/ci_e2e-mysql.yaml +++ b/.github/workflows/ci_e2e-mysql.yaml @@ -177,6 +177,7 @@ jobs: legacy_postgresql_setup: ${{ env.USE_LEGACY_POSTGRES_SETUP }} php_version: ${{ matrix.php }} symfony_version: ${{ matrix.symfony }} + node_version: "18.x" - name: Run Behat run: vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@javascript&&~@todo&&~@cli" || vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@javascript&&~@todo&&~@cli" --rerun From 65b9f873e7e1a48e2165b5d4046659529b6f1935 Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Fri, 22 Sep 2023 13:23:01 +0200 Subject: [PATCH 013/166] Add sidebar --- .../Resources/assets/entrypoint.js | 2 + .../Resources/assets/images/sylius-logo.svg | 47 ++++++++ .../Resources/config/app/template_events.yaml | 8 ++ .../Crud/Common/Sidebar/Menu/_menu.html.twig | 104 ++++++++++++++++++ .../Crud/Common/Sidebar/_logo.html.twig | 5 + .../Crud/Common/Sidebar/_menu.html.twig | 3 + .../Sidebar/_mobileUserDropdown.html.twig | 4 + 7 files changed, 173 insertions(+) create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/assets/images/sylius-logo.svg create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Sidebar/Menu/_menu.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Sidebar/_logo.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Sidebar/_menu.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Sidebar/_mobileUserDropdown.html.twig diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/entrypoint.js b/src/Sylius/Bundle/AdminBundle/Resources/assets/entrypoint.js index 778bf8d907..b91b3eaae7 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/assets/entrypoint.js +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/entrypoint.js @@ -13,3 +13,5 @@ import './scripts/apexcharts'; import './scripts/choices'; import 'bootstrap'; + +import './images/sylius-logo.svg'; diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/images/sylius-logo.svg b/src/Sylius/Bundle/AdminBundle/Resources/assets/images/sylius-logo.svg new file mode 100644 index 0000000000..8bbeaee68a --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/images/sylius-logo.svg @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml index e2bdc8105f..d4473ca307 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml @@ -27,3 +27,11 @@ sylius_ui: blocks: search: template: '@SyliusAdmin/Shared/Crud/Common/Navbar/Menu/_search.html.twig' + sylius.admin.common.sidebar: + blocks: + logo: + template: '@SyliusAdmin/Shared/Crud/Common/Sidebar/_logo.html.twig' + mobile_user_dropdown: + template: '@SyliusAdmin/Shared/Crud/Common/Sidebar/_mobileUserDropdown.html.twig' + menu: + template: '@SyliusAdmin/Shared/Crud/Common/Sidebar/_menu.html.twig' diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Sidebar/Menu/_menu.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Sidebar/Menu/_menu.html.twig new file mode 100644 index 0000000000..d9ef62fd69 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Sidebar/Menu/_menu.html.twig @@ -0,0 +1,104 @@ +{% extends 'knp_menu.html.twig' %} + +{% from '@SyliusAdmin/Shared/Helper/icon.html.twig' import icon %} + +{% block root %} +
    + {{ parent() }} +
+{% endblock %} + +{% block list %} + {% for item in item.children %} + {{ block('item') }} + {% endfor %} +{% endblock %} + +{% block item %} + {# building the class of the item #} + {%- set classes = item.attribute('class') is not empty ? [item.attribute('class')] : [] %} + {%- if matcher.isCurrent(item) %} + {%- set classes = classes|merge([options.currentClass])|merge(['japierdolexd']) %} + {%- elseif matcher.isAncestor(item, options.matchingDepth) %} + {%- set classes = classes|merge([options.ancestorClass]) %} + {%- endif %} + {%- if item.actsLikeFirst %} + {%- set classes = classes|merge([options.firstClass]) %} + {%- endif %} + {%- if item.actsLikeLast %} + {%- set classes = classes|merge([options.lastClass]) %} + {%- endif %} + + {% set isActive = matcher.isCurrent(item) or matcher.isAncestor(item, options.matchingDepth) %} + + {# Mark item as "leaf" (no children) or as "branch" (has children that are displayed) #} + {% if item.hasChildren and options.depth is not same as(0) %} + {% if options.branch_class is not empty and item.displayChildren %} + {%- set classes = classes|merge([options.branch_class]) %} + {% endif %} + {% elseif options.leaf_class is not empty %} + {%- set classes = classes|merge([options.leaf_class]) %} + {%- endif %} + + {%- set attributes = item.attributes %} + {%- if classes is not empty %} + {%- set attributes = attributes|merge({'class': classes|join(' ')}) %} + {%- endif %} + {% if item.hasChildren %} +
  • + + + {{ block('icon') }} + + {{ item.label|trans }} + +
    +
    +
    + {{ block('childrenList') }} +
    +
    +
    +
    • + {% else %} + {# TODO: Dashboard is not highlighted when selected #} +
  • + + + {{ block('icon') }} + + + {{ item.label|trans }} + + +
    • + {% endif %} +{% endblock %} + +{% block childrenList %} + {% for item in item.children %} + {{ block('childItem') }} + {% endfor %} +{% endblock %} + +{% block childItem %} + {%- set classes = item.attribute('class') is not empty ? [item.attribute('class')] : [] %} + {%- if matcher.isCurrent(item) %} + {%- set classes = classes|merge([options.currentClass]) %} + {%- endif %} + + {%- if classes is not empty %} + {%- set attributes = attributes|merge({'class': classes|join(' ')}) %} + {%- endif %} + + {% set isActive = matcher.isCurrent(item) %} + + + {{ item.label|trans }} + +{% endblock %} + +{% block icon %} + {% set iconName = item.labelAttribute('icon') %} + {% if iconName %}{{ icon({ icon: iconName }) }}{% endif %} +{% endblock %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Sidebar/_logo.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Sidebar/_logo.html.twig new file mode 100644 index 0000000000..d9768b7ac1 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Sidebar/_logo.html.twig @@ -0,0 +1,5 @@ +

    + + Sylius + +

    diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Sidebar/_menu.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Sidebar/_menu.html.twig new file mode 100644 index 0000000000..6f7e06e32d --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Sidebar/_menu.html.twig @@ -0,0 +1,3 @@ + diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Sidebar/_mobileUserDropdown.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Sidebar/_mobileUserDropdown.html.twig new file mode 100644 index 0000000000..c324e8f987 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Sidebar/_mobileUserDropdown.html.twig @@ -0,0 +1,4 @@ +
    + {# TODO: finish #} + {# {% include '_user.html' with { user: navbar.user } only %}#} +
    From 1cd5fecb980d14759ee54ce8c341a4e11f068c16 Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Fri, 22 Sep 2023 13:26:41 +0200 Subject: [PATCH 014/166] Fix "User profile" item in the user dropdown --- .../views/Shared/Components/Navbar/user.html.twig | 2 +- .../TwigComponent/Shared/Navbar/UserDropdown.php | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Components/Navbar/user.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Components/Navbar/user.html.twig index f87171c454..485c1907eb 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Components/Navbar/user.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Components/Navbar/user.html.twig @@ -13,5 +13,5 @@
    {% endset %} - {{ dropdown.list({ customTrigger: dropdown_trigger, direction: 'down-end' }, menuElements) }} + {{ dropdown.list({ customTrigger: dropdown_trigger, direction: 'down-end' }, menuItems) }} diff --git a/src/Sylius/Bundle/AdminBundle/TwigComponent/Shared/Navbar/UserDropdown.php b/src/Sylius/Bundle/AdminBundle/TwigComponent/Shared/Navbar/UserDropdown.php index 5a4b987e47..69deffad77 100644 --- a/src/Sylius/Bundle/AdminBundle/TwigComponent/Shared/Navbar/UserDropdown.php +++ b/src/Sylius/Bundle/AdminBundle/TwigComponent/Shared/Navbar/UserDropdown.php @@ -13,9 +13,9 @@ declare(strict_types=1); namespace Sylius\Bundle\AdminBundle\TwigComponent\Shared\Navbar; +use Sylius\Component\User\Model\UserInterface; use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; -use Symfony\Component\Security\Core\User\UserInterface; use Symfony\Contracts\Translation\TranslatorInterface; use Symfony\UX\TwigComponent\Attribute\ExposeInTemplate; @@ -31,19 +31,25 @@ final class UserDropdown #[ExposeInTemplate] public function getUser(): UserInterface { - return $this->security->getUser(); + $user = $this->security->getUser(); + + if (!$user instanceof UserInterface) { + throw new \RuntimeException('User must be an instance of Sylius\Component\User\Model\UserInterface'); + } + + return $user; } /** * @return array */ #[ExposeInTemplate] - public function getMenuElements(): array + public function getMenuItems(): array { return [ [ 'title' => $this->translator->trans('sylius.ui.my_account'), - 'url' => $this->urlGenerator->generate('sylius_admin_admin_user_update', ['id' => 1]), + 'url' => $this->urlGenerator->generate('sylius_admin_admin_user_update', ['id' => $this->getUser()->getId()]), 'icon' => 'user', ], [ From 15fa9840bd5d97eaeecc914acd5db9e97caf146d Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Fri, 22 Sep 2023 13:48:03 +0200 Subject: [PATCH 015/166] Add user dropdown on the mobile view --- .../Resources/assets/styles/_avatar.scss | 14 +++++++++++ .../Resources/assets/styles/main.scss | 1 + .../Resources/config/app/template_events.yaml | 6 ++--- .../Shared/Components/Navbar/user.html.twig | 24 +++++++++---------- .../Navbar/Items/_userDropdown.html.twig | 6 +++++ .../Sidebar/_mobileUserDropdown.html.twig | 4 ---- .../Common/Sidebar/_userDropdown.html.twig | 3 +++ .../views/Shared/Helper/avatar.html.twig | 2 +- 8 files changed, 39 insertions(+), 21 deletions(-) create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_avatar.scss create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/Items/_userDropdown.html.twig delete mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Sidebar/_mobileUserDropdown.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Sidebar/_userDropdown.html.twig diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_avatar.scss b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_avatar.scss new file mode 100644 index 0000000000..afb9a2e9c2 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_avatar.scss @@ -0,0 +1,14 @@ +/*! + * This file is part of the Sylius package. + * + * (c) Sylius Sp. z o.o. + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +.sylius { + &.avatar { + background-color: $gray-100; + } +} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/main.scss b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/main.scss index f6bbd130d0..70a096fdda 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/main.scss +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/main.scss @@ -22,4 +22,5 @@ body { font-feature-settings: "cv03", "cv04", "cv11"; } +@import "avatar"; @import "navbar"; diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml index d4473ca307..bc0f2cff96 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml @@ -22,7 +22,7 @@ sylius_ui: notifications: component: 'SyliusAdminNavbarNotifications' user_dropdown: - component: 'SyliusAdminUserDropdown' + template: '@SyliusAdmin/Shared/Crud/Common/Navbar/Items/_userDropdown.html.twig' sylius.admin.common.navbar.menu: blocks: search: @@ -31,7 +31,7 @@ sylius_ui: blocks: logo: template: '@SyliusAdmin/Shared/Crud/Common/Sidebar/_logo.html.twig' - mobile_user_dropdown: - template: '@SyliusAdmin/Shared/Crud/Common/Sidebar/_mobileUserDropdown.html.twig' + user_dropdown: + template: '@SyliusAdmin/Shared/Crud/Common/Sidebar/_userDropdown.html.twig' menu: template: '@SyliusAdmin/Shared/Crud/Common/Sidebar/_menu.html.twig' diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Components/Navbar/user.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Components/Navbar/user.html.twig index 485c1907eb..72a17ab8c6 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Components/Navbar/user.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Components/Navbar/user.html.twig @@ -1,17 +1,15 @@ {% import '@SyliusAdmin/Shared/Helper/avatar.html.twig' as avatar %} {% import '@SyliusAdmin/Shared/Helper/dropdown.html.twig' as dropdown %} -
    - {% set dropdown_trigger %} -
    - {% set avatarPath = user.avatar.path|imagine_filter('sylius_admin_admin_user_avatar_thumbnail') %} - {{ avatar.small(avatarPath) }} -
    -
    Hello
    -
    {{ user.firstName }}
    -
    -
    - {% endset %} +{% set dropdown_trigger %} +
    + {% set avatarPath = user.avatar.path|imagine_filter('sylius_admin_admin_user_avatar_thumbnail') %} + {{ avatar.small(avatarPath) }} +
    +
    Hello
    +
    {{ user.firstName }}
    +
    +
    +{% endset %} - {{ dropdown.list({ customTrigger: dropdown_trigger, direction: 'down-end' }, menuItems) }} -
    +{{ dropdown.list({ customTrigger: dropdown_trigger, direction: 'down-end' }, menuItems) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/Items/_userDropdown.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/Items/_userDropdown.html.twig new file mode 100644 index 0000000000..f24c6bb5b5 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Navbar/Items/_userDropdown.html.twig @@ -0,0 +1,6 @@ +{% import '@SyliusAdmin/Shared/Helper/avatar.html.twig' as avatar %} +{% import '@SyliusAdmin/Shared/Helper/dropdown.html.twig' as dropdown %} + +
    + {{ component('SyliusAdminUserDropdown') }} +
    diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Sidebar/_mobileUserDropdown.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Sidebar/_mobileUserDropdown.html.twig deleted file mode 100644 index c324e8f987..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Sidebar/_mobileUserDropdown.html.twig +++ /dev/null @@ -1,4 +0,0 @@ -
    - {# TODO: finish #} - {# {% include '_user.html' with { user: navbar.user } only %}#} -
    diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Sidebar/_userDropdown.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Sidebar/_userDropdown.html.twig new file mode 100644 index 0000000000..e408b06f69 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Sidebar/_userDropdown.html.twig @@ -0,0 +1,3 @@ +
    + {{ component('SyliusAdminUserDropdown') }} +
    diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/avatar.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/avatar.html.twig index c6e15a70bc..c03ed4cc2d 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/avatar.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/avatar.html.twig @@ -1,5 +1,5 @@ {% macro default(img, content, class) %} - + {{ content ? content }} {% endmacro %} From 2cecce283825cc0baa89dc61cf1564b5f4e31864 Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Fri, 22 Sep 2023 15:40:27 +0200 Subject: [PATCH 016/166] Add Admin Panel login page --- .../Resources/assets/entrypoint.js | 1 + .../assets/images/sylius-logo-dark-text.png | Bin 0 -> 17408 bytes .../Resources/assets/styles/_navbar.scss | 4 ++++ .../Resources/assets/styles/main.scss | 1 + .../Resources/config/app/template_events.yaml | 22 ++++++++++++++++++ .../Content/Form/_passwordField.html.twig | 1 + .../Content/Form/_rememberMeField.html.twig | 1 + .../Content/Form/_submitButton.html.twig | 3 +++ .../Content/Form/_usernameField.html.twig | 1 + .../Security/Login/Content/_form.html.twig | 7 ++++++ .../Security/Login/Content/_header.html.twig | 1 + .../views/Security/Login/_content.html.twig | 7 ++++++ .../views/Security/Login/_logo.html.twig | 3 +++ .../views/Security/_content.html.twig | 6 ----- .../Resources/views/Security/_logo.html.twig | 1 - .../Resources/views/Security/login.html.twig | 20 ++++++++-------- .../views/Shared/Layout/base.html.twig | 2 +- .../Resources/translations/messages.en.yml | 1 + 18 files changed, 64 insertions(+), 18 deletions(-) create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/assets/images/sylius-logo-dark-text.png create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Security/Login/Content/Form/_passwordField.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Security/Login/Content/Form/_rememberMeField.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Security/Login/Content/Form/_submitButton.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Security/Login/Content/Form/_usernameField.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Security/Login/Content/_form.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Security/Login/Content/_header.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Security/Login/_content.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Security/Login/_logo.html.twig delete mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Security/_content.html.twig delete mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Security/_logo.html.twig diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/entrypoint.js b/src/Sylius/Bundle/AdminBundle/Resources/assets/entrypoint.js index b91b3eaae7..adb9723c04 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/assets/entrypoint.js +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/entrypoint.js @@ -15,3 +15,4 @@ import './scripts/choices'; import 'bootstrap'; import './images/sylius-logo.svg'; +import './images/sylius-logo-dark-text.png'; diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/images/sylius-logo-dark-text.png b/src/Sylius/Bundle/AdminBundle/Resources/assets/images/sylius-logo-dark-text.png new file mode 100644 index 0000000000000000000000000000000000000000..e561950db290f8cfe767d453d2d8dba8b450e589 GIT binary patch literal 17408 zcmXtgbwE_#^Y&f36p)q%2?eR8TS8Py#HG8tJ6GuxM5IAlmhNr|>0UaerKJ14e7^6G zKZxb-J?G4wGxI#p%-OK_N^*~Ip5g!i@aXLunGXPfq5=M1hJ^usAKxc<3jRQImU{aU z3;goIG6@C$#&&q4=?nm*;KigLAQHG|b>NE>F0vXfs`h3s?uJgLfV;aphozmhv$3Ir zDTlq2dCI;hcqcmGt<0;B9;tf^o<1KZFC`9#oz0n(0(BwPb{2$h_S4`|Q{CvFt8*(R z_9(UX)U{Qxes+TK6wEfn zTP2=+W9lDBYaDnse0}=w^u_N~XK{3%RH4oJO#+#2R$cCUQ4GIX2VQ**S1r$hT~R44 z`oOa816Kg@tpw+K)M3D${6-simr*Q=+oq_u`Q+jMe1BZw>HB}zNmwqhz5s&9aL%5v zx*VsDliKD!ra%HItX<+#)Dx53em0I1!l||8-z30A()On@SVVx{pNBihc$q|upl(Vy zo7<@}obxje{QYAZG(W+E*~VV$giRkv&_PonyH#N?>V~Aa1H?9uFRxjSoZ`ZIN|LyI zqt@CV#xSIuVQ?80_*GF{O=;_ z>xIlUEc|#jukFwsiWll1?y-Ug-eY?E%lmHyDUU#o;flpQ&aqK25?Y-J7le|Ir9 z`MmyPJmF?Ny{V~*LZ;@1-(R6T_5Hf6`hHC|6r8J+pj-_WHJ8t5v2Wt}!otXVe@{9B zNjieE?76k+B_|d*+utn(a5@A-u_Wv%k5cX%$1@Z0QOR)tnZOp`YX%9Mh#s0Gu zVTG(kKpg43&$s)QX;eHKT} z%+^w=#OL;^lBe@=2E@(61vi~8|GW4$=W8Rn^Z_o}#vN93#Y?y~ zG}#$ab@&53Z%M)X@0Y!#qTH1-|LM;TiP)T<9f}riQz9wP?+^NZBl(Ncx%T|YZ{z{9aNT&D!6nat=I#IH z6>mf6woIwK;95-)aqoAYz91*U1FZcXRP7|IJufb2d%>L8CIOttXZHL|df#%_hpt+< zht2x%)b3gaE+5bMHEpj9sxQ=KR+2S= z2H7xUx_X2mmL}E8h`D~yP`;b+pMBo)v|BlM8$0`NL!J3AZtp%}`svc6-(H>7I{!>e zIt+^QT%lYu-`9m2?#TX1M17{t6Y)vYSY0hOR!Q=~i*oXNGTLA0(F_e+3jLc&olhN2 zYqlF+6tl3hdgm=_HsEb;6 za{bu`p_r4deDx^s7T>Gca@h1h+o0N0aI4#fCA}X)J6z(>S0G=MTanP9kb7AA_HH>* z5%l{aw}1rarfJ6T(rGxs>^}Zq3A$z`iH-&BykLo%*_(LWJhf|WqkL44fz3ol<2S0{A9*X#Us+ktX3 z{o1gbLJ457{pWXBU)Z=G_G&-i;x@D+__*q3CYn14eE6|V>D=wBWlmRP^s*w5?@5`3&P1paM6n+q68T6nZ_k2 zi`Eo6_>k}X@UE;7g|ey0j4K{^wcGjb@#RRq{nC)$zgIsvNoU3E%+-_=&j=ES(GO<~ zmrNSWPgLD$56oyD-p8^-NW>22-906jIW|uG`ucimp9C|?xXzbKk#k9tae1XtEI0X| zE|)@l3MDR4BiiQoh8G`PTyKY)sA!TXUmU%ytkqoVzU4NPss&cJ%|?4H@t2lUs8rWs zGXJvW`-j6!HjA5LZnjP3Q|5TkxTDaML~PQ~M2MVPIdR5kzuU(x1j%83x)hIl(#SbA zhodtnbj1pMUcjAza?}=Ax$SY>5HDhRaFttUUPEZOl53+L8&7ea3Y2D+>lMQvB3Qp9C zhxinC@>$;}dI}KkD8}uO$j(U19Kh7o1-#NUvFN=%(+ISqz{lc`{W=v|-4Xsq=_*2& zSEBh>wVjD1B;&w5dhntH-q26sV$ms6#+3q|gc6%m7-H zX|%)FX5p;i|D2vZ@f+KWBq$*Fb{A$tUY`#pX%+B=Z{kcX&4u4=ocO^v#Nj=;n6_Ug2enp}EX z1~yqrH2R1%MF40@phzK+^<;b!c7xd)xrUb+<0S!I&mZ}tsEfS+qd`YMHo?fE0dRSB zHO*mvU&{Gf?&dHKcmA%Fp6cKbSrz5Cv%j`-&dC(#*L2l5zW7i03-C@}{&ud$wlM}v z9rc2AUW|=`sl&;vK_7W)4oT#Qe);u><*Y0)cSydetdv2ufyPDJ4Q)kTU+OA~W(py&Y-fL#!^p6#PqMJ&zvGTut z|9%C7-L9PN%~^$&5w{7}-9wZ6Bkv&|K?p>3=6l0>1mdl3!}E$U2RQ9SRfp_WJ8fN% zgVdKa1DI0XnKOVdEQA5wh}0Fg&xtdhUI}tk=PgO+vURi5E7j98-!AwF6LY^lvlS-X z$BZH5>kH+IOxhsKR2#=(k-mfMcU!z;&AFS{C6;nw5px4~KlU>_^koz75vsVYl?Pz= zINA`Op(OQV%fc?XSQG*wXOVmb5bB|D&F_j*3sU@$<5To?`_miS<3;^iFo2>J2CJ?` z3I%R)c%7i_PKF_ycw4FR#v+n zCSlF?t}8&_fSY7ct%7A&WYmsE>T?{{80})r9xD_cjx%h@)*f@prXE7xn_4%xOVGhD zUW$q}stZCE#r2B$Gcz>&Q7gEvWpOMb7tI|queh9wR1eJbXv?UWKr<{by*&W%o^Qj zZNJM$uSKm2PtrHvsFtZ3;)?u!rl+B$wX+1G*XM8wlr05d3Ekmql;({%tu7|rnmxzX zV;}LQlst+QpDmTrGP1)>GmKvKGBTv(J<5di8sgRK`z_bdMdv*yWI{yjd*he+B zjl$w$%}2}ZxPubou4`;==I?^%Wmy|QY9J~(*EQf?$E)N250mthCUgD5(>Ygh%a_oh z5m(<(0UX=7g^}qY=$8z4Wx&hShq*Tyf{cQ+#butW=P+4eT?gdIvs!GKfk4- zME{jRJ20eIJ?oq=slFB6A@Vr;sJ6Q(Rl=9gq4d}oyVf%K>?ORoh=Ga~G7{BLvV_uB z#fbdmqPv7+5S(YJ4BP-?7v95El%J-c`W?n$Xf>>wXGfaID0eAUGk&yCjxpC;d4KJTj8JdH6w$}{AgFO$354}8P&W*{{v(bMAoPuGVrIOTB?Zbh(8LmiE z{@3r`DJl*MGt3+37H9QdhY?8qWw8&X4!yiA15fv%*+_{S`O_W9GcsPUDYhFN zGS6k@g!bzEnVbeg{e#D%mVQZ5k&C?6q2e*<@F{bdG!mgnB3t|beABWWh;)F#;?2!1 z5QWx{0H1O)?I#^ska23!|)QI16hRcb+G zAS;YjC=(u4LpxCs=rK7Q?%_z0=pN(_YE~HkIBs#5noy_?LZ83%L`582#67gJ5`ji9 znl6g+$uxB#gfxt+^p;hAb2W6}HKL5*HAP8+)ue4W2_a(Oj$hjUm)ODoPQUPF(q*d~ zGf0qD9u@paM~fRwA^Fg^x)aG`m&f$bfi%p}yOg z>zWSucw8>k;5F8qMywBf_{U5l13IbxkfB2G{rmk zNrpEx^foWd2gqTy;8mO;Qh`GKQ{&=}?;2cpYi6jWm^I#N@j1>O8>@Z%2yv(jaTUlAfc1zpww7-K8ExaBm`EF}Ld67P< zyl`u!J%bf{DXx&cS1bSS-M^_4-IV9%dy~*uhE6Umphz)0VvQKxeL6lrW!pIU#Dtaj z>56Mi2{8$YPXN|E5Od)A-7YxsNDc;TU2}~Y;#wn1&buu|3RUQ`65~uxO*KJA(f|z4 zG)zevcm`1>Gw}=Zg&Ew35g(v7-u(9H;s4hGjy!o=-aKvoretlV0K$`T=XYWnv}PrT z!ZPN;kExTbllvrqKVE6MDGajhv`vpk`C1C9sy;@qY7pZTNEq?oKSI)S$oCx$^tJLT zri_l_g5t?5t{4IQHn%UqoCW<$@$LOfyHvV@jy=)Exq2bJuR$Qf2qk5#REOUJOT~yCzCB-6W)0FNuKn=W z@Pi{RsXCYSrg2d!eV5EVy0cwNw`_t;DcGbookU@XVV=HsTBcYr8>vq-QpgL1q4L)* zo~~*Iow3uKrEo4-+kvffLDXMAxe?-DGd+ zDomd!$t31l?l?2bMSo++!4zr!`E!|4FGO%6n%b2N5+lJz#>Iv}QZ#f7IN9-|gNT$u zva)$7mO+A$l(vDIorpbR%5QTg4UheVONw5g+N2+^RqiRb)GZ6p_zuU1EjCm=L@H<< zbQLFz(npnFKPgX*5tkC3P|YvxqUmO{_a;(+5cN~izOv}?zr`4s)W5p3q+Z@yLCSF3Fo8wm?rY%b9&IqE#GyJkgfxh;XtPhbZAw}5 zIwFR>yi{oMp`l7!4R_BZm1pMn-oVu@ldn8LhntyqulbGY5QL>!i_ue1*RvsAXv zK#UVl&>oGcPTn>*a3K~e1o@GPjvjQ`U`Lg?+fAS=&|*d2{kFmG1Y^qr-c7i|40oaI z7B}yWq1UHch!yzE`~2Oi8g%8FzA2?B{m*&VJ=%}?>?2vSCt<(%#50^o|CX*eaaVfA zf?rjfHHdyriS6Z&Bqq;}!8gJJ+J?y{~VvxcR%>m6UpYtB-SuUH8l&%)Hc8Ja~Xa=2Oh~ zvuDS~)n*e|isRi|4SJU9ui3zOr;Hw>Gy|A*JBNQZ2Nq|q&}Yq*g%2)#HV`sWN%M>6 ziSfoj%abh*d_D4oNh30vEywe`8vlWA6@x%%F6H8 z6A>2mYl`3_Wrn6yC0d^L3T(DM+U6l(L>5FUIvcJyquiZbcT$1+?P!! z1<&oDQ;eh5JB7LBPtKN*qkvM9o*XceadUUwmKqf_>lOLtS6v2$F~nzMwM-mHAXs^% zsHzWxxqgi>W(i8#gjiHe-Bt1b_RAZ^PRr`Y0!kZ zR@=`NnFh}d$hDn5bz&O0@zwB0`PWIvShcw~z$n9yjS-+0(Z#P0gYA{`MGk@kurQd> z5vi2}hkNFwshsWxrgab7&_y>x@>d+>?;)KOc4ftf@d@NyW6=a|xX~TS)bLMTE}x6T z(&;1?Y)fL{-0-RJd#MwJFqw`W(PtVTK72K|PL$?4_J?RC_xa~p`l)Ei_VG>^9a)IZ zUpo I|>;{`n4^C%n{j8XEf@xBf`9Q^8$^AZRlMkbzP=QC(eK5PY6040`91)0)JMsi0}`jDOM^CH_6icC%I6s@ka7v8Gd{ z`mJP=mDN-4UN0Fi5V2$OCTd{OslMO}kyjr&E`n#gNh{e^MhkdVyjM_HOe524*qv%o zRgVBuoi$D5mp3_X6!3F)eu}2Pah= zGf8Q$&^wkeK^1pJ%uF=l^)W<7g9L{p-Cmn6r5CNAp3}F`2cP`7dFTlJzqCrb=89)H z*d0abzSTf;c8$tHWXKOs+!Np=93OJk}6zG8gIk=y9Z}%(=7X zN?^Efb-L>=$IyL{=*S=`0Xd9~=%iH+d=K*U_;)m2Jr+6=`ar*xK={&zH;DZ1Sq^X8kd2)%N=O4D8J+$wU{VCEwh|# zso)GISdeBXZG9w}{YaNuHV|EAx(Ebj(!qE~e{agcC4HA%RRfY-LME#~%@lf8fE)W1 zgtH8>$z2V07BU;M!0lX+;jv=e_xftxH^08i^9wpo`#$JnD56tF$4^0`Uklo7LDKs7 zldFIz-Sjtsjo#<`r(kyVr{c5vML>D26b=q^w)4w+5%n+;DfIXkGpF$Jr8lN`n)GyE zq>NR@m}_$&#U`KuF~?UqXX*H-sx0Oj6JQJg;4HwGo1Op8ArOzNp~?(|jVQ(E!g-Mt zmZB8TWzP8>mfPllqU!p&S27o-qWj+J;}h!$gkNn{)kHkQE@;6|9X_}`+hOz_%aS^= zw&8YtT#@Ro3yC?b8i{ufsEk}G8oBAukym(1BOjw@U1$NtN% zcq^$pJG1v&4csa!15c_-EQD6T6)3s?Jm5@Z-Vf=@j|_D<9m$j~*6a2m0Qtb<|KYf$%qF#9~<8waK&!%)J9O9q`a>-V3l`VA@3RRTykIh60q8W9Mgfs6F64SQLJScD5G5UG*} zmoIJ}lXc!fHK{2i12di&#^qVE!C=&w{pXQ2PJR(Fp(I&Ls92vJ>fcuR4TOi+_7we0 zoEk5&r_a&`vuX74YYFK6(^6?H_m41G7npD4bBG~j$B6H=!nfasu1+bJ%xjt^h16h^ z9WLE0S=a!Emd(pTb%t!Nd;w2~P7tMuQwTbYSeVsa+UKJjdN7FQTkd$lV5RV``mb!} zWol6wS7`7@m_7yMlIQ|8P5KQ+cP}?fbhb|7Nhva&ZYJUlijIYQGD98bX4p3IkHJTx z4Au~okx|EqN7@?fe>_7a8CDt>gZ&!54pC=p)40_(h}FrdeDlu}sv)Q`dYz7>_^JZ> zodDii!ayC+hRK1iFB6E#tEdYq4|*|H#_o^niMRv&kwfm$Mu$acEQ^$tS*u;#{hNwA zQ*$tx0UVz45%ZQWmn*BaZ1XK6>K^^Pcx%iI$4>yoZMW`7T0!6ERfgo8s6T7QzGJC^ z6_(@TDr#<{U$KC8({3bW~NvP%nQx=tvX#JxWu^e;lm-nZ=9N9%9v2)NlXnhI~PpUUiLjBR;>P zYCRMVbO4pXYvNcQnr-C@3{X0CbTiq(gYH*MSNZckt#z>uFf42p10bK zZhPWp>}At8MekXO-{roVTk(*m6(tT@cWCStv?ZgbU3ZOknVgs)Z?MxDP9ELBfFNNuUW_3#E@9>VBp<&aKJW zIQ5xbeHpP^7#NSKJctM*c^g=(GOa5f=#P}LeHkB_Ao9x^Z+1X8@shw8C zVj=lKN%GV_#X=EAyc7n6tSq8*a}V@IWWImZ=z8{TG0fNxvzw0K1#yR5Cuwk$A#P_a zUL&WEo@3B$NV+;02#DdeFZmDnLsqlj^)~}<-f7vof%gJ#GdJ9NJp}uOMMaU&anA9r z&riYv*OYVYrps1{;2Bk*Cnk`Qket5zw~j-|t{2rAvE+a6ixgMEjb)czDfLWi#|Cqy zYl9w?ML@uV0ooUO$dlTd#}T5b`2>d~QsRX29n8~nK;gmuJd961jvkXG}R+>x=)R%cTKW=i3c;c+kb#Sv{3+ zsy311^kx-W6`2{9$xF%`LCJY(nAYa7=}l;{oiWY|*NZdZPjL^#3*=LzVdP66iS;4S zI~0S20BMZGcz+tN8%YTK<$9|xnZn-76k6;bc!A-8oM%U6K`XT(FY%UmY*a36a#V7P zoK~yy4Sh*=-(ymTbLtBDe^a~_<{;(TM48@njeeX8lIgp@u2?JBaai)j{LDt?U!GQh z1d0!^*R)PMF?5fZ3pgnS>7`xGlp2D;axC2W>2=go?m#TDlCqQ8YHM&)cHcJG`J}xOB5IQ` zJfbp}OUyjm9^XY?`}>a2*BU65QoOn2nSKTIwRzC7eA)w@Zi%Lbj*6yy*}dy`ksVAa z^^CW-JjsL`9-i8ycaTt$=r6xrdH&eZBDE?B)Z@!8@n@85{$)WkTHVXQT3(|<++z9c zcdXy(_U|a65;)7wY_^TUe@j?(Ff@|c{b=woGHSlQb&-(i{h42}=IEb1bGvC$?efXrcdAP2}(o5V>;!hk#j(i?& z&)RluaLIES@TX_(Xcz8AGd|D5bVCdGi{AjG+Y-B%nFg+Rf?r~_3i_<1YUZNMR?m}g&&rm|U%GM)Ty`H4ze#kghgUr})DiT$yrK1=magmJRqUsg zQ6M^XGusB?^Ld-rZOUT1LD@np5*;0#1!b$OMUh1zgR{I>N+foLxU1^wi+wj03_D1Q z3HX3OMG}D?>0h+V2TfG@9BrTa_9mh5gxqCcvKl-2|RC zxu5%VmP6M_kTdh6=Hnrq9x%}ee3PvG<%~jW-j{j7N0dK>q5%f^A%dd?bIwx1_FbwD zYQNT{e|%46CJfBKmw*EzA!_*Rwf@t(D&P7Ii}g@|Lb4M5 ztEXMSY!>3%%g~WK)sXE;>KuwEC!;pJeL}%!_0bCdv(S&9KP4GE+(Aup`vn`@T7%xP zH9U_YDvinP$}J>gq(}R00c%>BE z6S7LOOj_Gr5l&v4*6if>#ru~4H7KaIeE+`T&m(P`hyI^5p48C2scmbS94>d7QKTy& z8+fn+_xA{$9#d5tNNjc4{(wwa4H6-iE%#^_Y)fU`x`GXj^6nY^*qmsokbm{biwLg8 zW~)fV*dS_r7_ZDl313eZRO5ywr=*mdAJEto7k1X{&6U;qacUW<)wZjy{?5FB5#@{F z|LEIx9Q$@)>{oYTdtIusQ(|RpeK!z!P<1;ElAl0t?Qm&!I9;7A} zV1~UxgMVS?6?+St%(`tg2#%k%cWhm1od&mp82f#*S)TJ>yszO8rNw^@NI-!51YhyibZ0tiTS-o)2Jw9peliB^d ze=?wfsg}KqtC&`g0I=yp1$eEswYoiZO(^S55+>u;Y1I6T!Naw-aBOVs9{_llG&qOl zSxVpsP3$%eL4feAqVnk~`wz;$n?%+HXt}Gs79@QN^wq#@Eq%Kka|Y zv6BV_gw%ef(^1O%N6UiWRqA(L*#j}TA)!PI>|sx_ca6`M8{sXkDh}0c40Tul1@aes zipMuT-F~*1E&e9eV$j?E7TyAD%P>xO&~AR>whutZGaQinJGWX(hoO+m;4)fC5e7qM zbg02jm1WAB77l{mv+`mrOK=&N3HEME zOQY5tOh-2~2>)HIq#PU^G;p)2nDk;5Z$;)Ce^(!aX!B&nZSKlBnifYQW*bT9 z2?|D~C^zH{91WhNZM$I2WchW;(6?{j{t%8z!`BPNlAWEM_g)+r{oWW%sYShzL+pjV z=K*Cb@w~TcR{G6_yAAn7@++hjE;N|Mac6~p6~;(lF#lJ984W^a4O;3kgCUR$2rD1~ zswVmOw5vxK<)kV5iUmXR5ubMTKW9$hGkFy=Ykuhd;901;0x@O^pUs+nb@! z7VS!N`=7Tw82_Gw0a&g%L^h!Xr^^C|M;K)5e(+ctLRJK#CJeUJAkerS(z^u7{UhC3bOJ%upbO#OCDE%WtWpoQ!k zpeNmx*3@it)j+@6UF#t^E%A4stG`&}*?S!zc|SZ0Uwj7!F)OQ%l7+@H*WJzOdS{m8 zwliEc_SR0x4;{YehT$CAk;5*&mLww5G+xXi^e5~U+Z9B# zwx-4`4S~2vwVwPH$8R+eN-y&>a9tplv#EIZ3YTA|0zEbtpLI#PuXX7}W3I-;JywN` z$URC&EDP+8M$$D;_7(CeI-3-}AFmo$fU2O={TAWfUQ+8eWS+Z^26b)1hII8v^b1AB zaUC`RLYyEa=FeSglzkZT_KPWbLoH-&*;5#UczATPPrA~Zy&W}TRlOhgZKAL;9$KqC z?rMFg&sAJ_{KO1KBdYg56AnZQdl-!%2nfGhB|jbIwS7HTlWqGBEP(SWHqz6a%L3nW z=4c6*Or+W8WElARAx)bng5gGPwVivYqFPL4p&^}Jt4WjscJmOruX>z1hMPoA2n0>B z<&G453E&d_ZN@Fj{Zbrzh_R^JIs<`_hUi89xua4BF3<&{Rf);SFcSwuM!aa)O$Tlw z*Ohx-iYtVivb^9KdL^q=Yj>N~TcB8|4Z>vFW}Ei6zj?zkeB4nSPW1%(vDCllaUU3! z8hgA|aR@|RAVu*}rdz(38ONc;3But}*zBW*!Ia;_PQPDWHPb?TMBt0t7$)7Vpw5&( zzSm=BX0Gfon^V)!umKC{IRuvQLe!OPU78RG=sfk;424QmTIgM#<<7s)pHceNKLkl- z8YzzNGj{lodcnnmB%pf45#^I?#T;xeUc6Z=+DLfd)nSK%@Q(-LX%@+0R^X=J`9)&F z#Khz|y4BK(T2_UMZV+Ke&SyDzqg;RBZXRRV^0_4ATc4F*D=pYQT6~Z0w0F^Dg5p8Z zcGIqinyw-2=@e2~H_G$V z9@;8pyCVll%x<7!z*P*#Bo}h}RVLF>`#W!60iKR}hz5TLHZew=)zXnDjw>;|3rzIg zL=lCw{U+_1r-atJt%9Z#PPYE zj+ki=-|K+K<5Ne~Pp1!;hUP-=GBh2iQZ^a^r!neYlE8d5W!Bc-U2?rK-aTd8F5%`f z%wqcyU&8|#gziA1DS5Z8(idYGIE}7IYw9g8+E^!>XHSIw(w-<7bfOii4s02N7Af4_ zRw`>KQ$aq`E=7P{3w#>-3tI|MIQ~e3^C;dAGA;k_ttcr&J%mSp-sG4SAQ1X29h7b- zGtu=8b}kKEKM*_EGSg_+L$|UJukXD+1H9Xsom?LZ^mBhAyqF0SP+cg-wA+hWJ}5=X zFf@+oM_`A<8}_WA14{~xrR>C5Xfbhd0R~*5sgi&tyS*%g-FQSFsgUY6l3NY-&#!o#~pwZ`V(vU1E996OC5;S8VT0TAR>z{9fm}Z zd;C~x<)#@9(g)Ke5HMg9j*n78m=5VAV)0^rp_l&n4YDmO^tnHldX-?4Nz8#IvMz zbJvB*%ir{XEdeoL5ryFBBjBe0RSB>jNW?j`9q5Z2Fk`B`0+yg{Aj ztw(upoqW-Mr$7C#!0s5|{}?-z=WcMy5>szQwbpf)URFu}p(gr5wBx;lUh*oTdT%yjB#kJxBc%460 zi1o207jnthLx8B_;^N!3UAo_(R^SOx?(KZRI-j0QP>mK`4b|<i(2sij z;slB+D~I=2e=y{`YL`22D)I93Gtekond;Cl|Pme zM%$(t*d_@>;8V+5;slfNRb!TiQMQ{(kc$#}z4&-{&So`m2?ENJcfWae%_&?df@5gQPo z40d!>SN3}1$ZY3cX-Hnnz4j5#b1B_nK5!9TvP*48B=QgIQbaxI0COapcD&Z=erF2A z6DsPpr^{?UJU)W~?Z_74qhy;!6z3>I^3v@FM^Zw4EV?vYlQbiqwL1;=l82IgY3Fo1 z@1RKR;`qB#l< zpE+W1J}K~ISFQa6y6~uL^EV1p;O~pSRta)zM>4%&K~}^&)|k%=MP)#eG!4@G5mR@i zviKB-7MF>Rswc7sjE3oo%ED%WZ*n#)bp@2nyXyh9j=P?C)vf`L?-X6ZhC20NZ$sqV zRT%=ToT8c)mCdG8Xx4T-!NVw(-CZiQX#?}J1WH-oE}fbUC|t(93cyIibs%pOPY79p zjGWfjx2sG}Ru|~34!nGM^c#Mgt6U67x7E{Cu9 zMdPs1C~g25`x4e$DWj)Hb9KIZ;2Md#cT`@`B5K*qqKEn04aDm`NqL^=Z4xL3m+3sX zPXSSxoOy~c85{3aj`5!e;hH_1#E*MJgO6xZa_4e#EN6)U3CQ$!kw1Sqc)fmruv{PP zhIL`MA^)wfH%~E#8|9W;{O(c_Xu&rx{d$e|qqWx~2W-25EZoKD~Ev&{tfZ1^+q4L&?Ff)t>D` z5!GO1D|zq{G{mSr57gFWWL17U+XwQW7_!3Y zEt<273XAvx6BP5af9L<$T0dH! zQ6npuBNukDu%jaooIN<-glw56o9WAP`@;RnR74T1^CKe!_cs0CU#gT=ngO!o6E6X! zcjXH&bOnZ78Dh3(9?)&}=vJ7_H~VC>^sK~J4B+U{NK zrzuYjlNbLEa36N7Twl$>sI{>`q*YCtY-??2H`F%nO#>W2pkT-K@P1jL2ZNvkGHP*xlcRTz18^3BHJdq_H&~;_9$L8-XFFw& zW8#$)Rtb(g@J4^CinvEw@ILjsU8Qh+{D>}aPbzZ+fZrQrTF!6cvR8@45M;?6xqwG; zz@@cN!Y7i-UrA>(x|e1#&HlU7HkG(-W=z9fAuv1U2Le>>-?D*ZgpMo$mws&Z5{&6MQkqQB(!Rxei=H(5*}x31D6`KB%ky!&M^W2Flg}Lcd1_b(YMFAk`d_&u;}KsbH*ONN?p>Iz??;d=`sT=st(>!_6)k z@5Hb;z0(-y`1o^M!%cadiE1M&>7xnKmQx@nw%1*;1AWd2#9|i0>VQ~;L2=y9fIkB> z#%k`ihM1I;qZ+Ky(La{b!xWq-!?Y77Ex+&rP@9Lo7Gt%wy$V=9zkGQ-C=MuG|dNH~-r z>$>+RR0ESICAtpM=2hx!!e;iPy+gCeckr4f{&&2?7}!_goV5K#Z}Z~GaP04Rf(|mj#SX)Jli(5Jh?O8jur)cDK=lV*3h2iXnv0Mlac5Gy4x0uoN z7(6BE$MbN6tXloN(#U2)x;X;r*`aY%o^R*D;PZSv_RQ;Rx?djW_ion>;ztwjPW>vIi969fmP-y zqOfo`(UBj{()?DElkmAY2-Le$j)Dlpg20pRzh}WiA^E7SBK#P1#f7|H3}(Sg2XbI~ z`0G7talC7~9mfs5herO~UPk9||cdp&?n^Na8^BjFl{StQ!l^N=1b>tvq> zLvjhQIQ%U{Fp!|6cUmf&`f{gvrM(5<2Lxw#*=IIFA*eAalsBu$sHj0?^KJ9)!5R4A z0Qh^>j~zC_qYYBFNX*vLfeTPl!GFc!Kq^(oz6XkuEXB{ z7smiN|JECDnxoCtZ(MTyNRJ~4agd^-qLWNBaTS0|VeJZ>T>ze7#(cvt-n2KJ5JDs` zD<@b0FnnS7b_Q00000NkvXXu0mjf +{{ form_end(form, {'render_rest': false}) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Security/Login/Content/_header.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Security/Login/Content/_header.html.twig new file mode 100644 index 0000000000..3ebc72019e --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Security/Login/Content/_header.html.twig @@ -0,0 +1 @@ +

    {{ 'sylius.ui.login_to_your_account'|trans }}

    diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Security/Login/_content.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Security/Login/_content.html.twig new file mode 100644 index 0000000000..57ecda8e7b --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Security/Login/_content.html.twig @@ -0,0 +1,7 @@ +{% set event_name = _context.event_prefix ~ '.content' %} + +
    +
    + {{ sylius_template_event(event_name, _context|merge({ event_prefix: event_name })) }} +
    +
    diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Security/Login/_logo.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Security/Login/_logo.html.twig new file mode 100644 index 0000000000..3a44a06cd1 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Security/Login/_logo.html.twig @@ -0,0 +1,3 @@ +
    + Sylius +
    diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Security/_content.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Security/_content.html.twig deleted file mode 100644 index 3cdf42fac3..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Security/_content.html.twig +++ /dev/null @@ -1,6 +0,0 @@ -{% include '@SyliusUi/Security/_login.html.twig' - with { - 'action': path('sylius_admin_login_check'), - 'paths': {'logo': asset('build/admin/images/logo.png', 'admin')} - } -%} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Security/_logo.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Security/_logo.html.twig deleted file mode 100644 index 06765f40a9..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Security/_logo.html.twig +++ /dev/null @@ -1 +0,0 @@ -{% include '@SyliusUi/Security/_logo.html.twig' with {'paths': {'logo': asset('build/admin/images/logo.png', 'admin')}} %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Security/login.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Security/login.html.twig index 622287c2a8..ca0b452149 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Security/login.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Security/login.html.twig @@ -1,15 +1,15 @@ -{% extends '@SyliusUi/Layout/centered.html.twig' %} +{% extends '@SyliusAdmin/Shared/Layout/base.html.twig' %} + +{% set event_name = 'sylius.admin.security.login' %} {% block title %}Sylius | {{ 'sylius.ui.administration_panel_login'|trans }}{% endblock %} -{% block stylesheets %} - {{ sylius_template_event('sylius.admin.layout.stylesheets') }} -{% endblock %} +{% block body_class %}d-flex flex-column{% endblock %} -{% block content %} - {{ sylius_template_event('sylius.admin.login.content', _context) }} -{% endblock %} - -{% block javascripts %} - {{ sylius_template_event('sylius.admin.layout.javascripts') }} +{% block body %} +
    +
    + {{ sylius_template_event(event_name, { event_prefix: event_name }|merge(_context)) }} +
    +
    {% endblock %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Layout/base.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Layout/base.html.twig index e28f16e847..a6ca4a7f28 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Layout/base.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Layout/base.html.twig @@ -11,7 +11,7 @@ {{ encore_entry_link_tags('admin-entry', null, 'admin') }} {% block stylesheets %}{% endblock %} - +
    {% block body %}{% endblock %}
    diff --git a/src/Sylius/Bundle/UiBundle/Resources/translations/messages.en.yml b/src/Sylius/Bundle/UiBundle/Resources/translations/messages.en.yml index 90fd0d620c..25b7156bfb 100644 --- a/src/Sylius/Bundle/UiBundle/Resources/translations/messages.en.yml +++ b/src/Sylius/Bundle/UiBundle/Resources/translations/messages.en.yml @@ -447,6 +447,7 @@ sylius: login: 'Login' login_button: 'Login' login_sylius_store: 'Login Sylius store' + login_to_your_account: 'Login to your account' logout: 'Logout' look_and_feel: 'Look & feel' lowest_price_before_discount: 'Lowest price before discount' From 63136e4d277cf2878aa415c158e21d07e16dcd45 Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Sat, 23 Sep 2023 13:39:55 +0200 Subject: [PATCH 017/166] Add header to the CRUD's index page --- .../Resources/config/app/template_events.yaml | 11 +++----- .../config/app/template_events/crud.yaml | 26 +++++++++++++++++++ .../config/app/template_events/customer.yaml | 0 .../Header/TitleBlock/_actions.html.twig | 12 +++++++++ .../Header/TitleBlock/_title.html.twig | 9 +++++++ .../Content/Header/_titleBlock.html.twig | 6 +++++ .../Crud/Common/Content/_header.html.twig | 8 ++++++ .../Shared/Crud/Common/_content.html.twig | 6 ++--- .../Content/Header/_breadcrumbs.html.twig | 6 +++++ .../views/Shared/Crud/index.html.twig | 5 ++-- .../views/Shared/Helper/breadcrumbs.html.twig | 14 ++++++++++ .../views/Shared/Helper/header.html.twig | 17 ++++++++++++ 12 files changed, 106 insertions(+), 14 deletions(-) create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/crud.yaml create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/customer.yaml create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/Header/TitleBlock/_actions.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/Header/TitleBlock/_title.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/Header/_titleBlock.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/_header.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Header/_breadcrumbs.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/breadcrumbs.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/header.html.twig diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml index 71ff64c0fd..a1c81d71c0 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml @@ -1,16 +1,11 @@ # This file is part of the Sylius package. # (c) Sylius Sp. z o.o. +imports: + - { resource: 'template_events/*.yaml' } + sylius_ui: events: - sylius.admin.index.body: - blocks: - sidebar: - template: '@SyliusAdmin/Shared/Crud/Common/_sidebar.html.twig' - navbar: - template: '@SyliusAdmin/Shared/Crud/Common/_navbar.html.twig' - content: - template: '@SyliusAdmin/Shared/Crud/Common/_content.html.twig' sylius.admin.common.navbar: blocks: items: diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/crud.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/crud.yaml new file mode 100644 index 0000000000..6ddaef15ab --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/crud.yaml @@ -0,0 +1,26 @@ +sylius_ui: + events: + sylius.admin.index.body: + blocks: + sidebar: + template: '@SyliusAdmin/Shared/Crud/Common/_sidebar.html.twig' + navbar: + template: '@SyliusAdmin/Shared/Crud/Common/_navbar.html.twig' + content: + template: '@SyliusAdmin/Shared/Crud/Common/_content.html.twig' + sylius.admin.index.body.content: + blocks: + header: + template: '@SyliusAdmin/Shared/Crud/Common/Content/_header.html.twig' + sylius.admin.index.body.content.header: + blocks: + breadcrumbs: + template: '@SyliusAdmin/Shared/Crud/Index/Content/Header/_breadcrumbs.html.twig' + title_block: + template: '@SyliusAdmin/Shared/Crud/Common/Content/Header/_titleBlock.html.twig' + sylius.admin.index.body.content.header.title_block: + blocks: + title: + template: '@SyliusAdmin/Shared/Crud/Common/Content/Header/TitleBlock/_title.html.twig' + actions: + template: '@SyliusAdmin/Shared/Crud/Common/Content/Header/TitleBlock/_actions.html.twig' diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/customer.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/customer.yaml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/Header/TitleBlock/_actions.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/Header/TitleBlock/_actions.html.twig new file mode 100644 index 0000000000..4235115ee1 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/Header/TitleBlock/_actions.html.twig @@ -0,0 +1,12 @@ +{% import '@SyliusAdmin/Shared/Helper/dropdown.html.twig' as _dropdown %} + +
    + {% if resources.definition.actionGroups.main is defined %} + {% set actions %} + {% for action in resources.definition.getEnabledActions('main') %} + {{ sylius_grid_render_action(resources, action, null) }} + {% endfor %} + {% endset %} + {{ _dropdown.default({ content: actions, button: { text: 'Actions' } }) }} + {% endif %} +
    diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/Header/TitleBlock/_title.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/Header/TitleBlock/_title.html.twig new file mode 100644 index 0000000000..a5573f4004 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/Header/TitleBlock/_title.html.twig @@ -0,0 +1,9 @@ +{% import '@SyliusAdmin/Shared/Helper/header.html.twig' as _header %} + +{% set header = configuration.vars.header|default(metadata.applicationName~'.ui.'~metadata.pluralName) %} + +
    +
    + {{ _header.h1(header|trans) }} +
    +
    diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/Header/_titleBlock.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/Header/_titleBlock.html.twig new file mode 100644 index 0000000000..c24ffcbd33 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/Header/_titleBlock.html.twig @@ -0,0 +1,6 @@ +{% set event_name = event_prefix ~ '.title_block' %} +{% set resource_event_name = resource_event_prefix ~ '.title_block' %} + +
    + {{ sylius_template_event([resource_event_name, event_name], _context|merge({ event_prefix: event_name, resource_event_prefix: resource_event_name })) }} +
    diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/_header.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/_header.html.twig new file mode 100644 index 0000000000..6d7ec5b7d9 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/_header.html.twig @@ -0,0 +1,8 @@ +{% set event_name = event_prefix ~ '.header' %} +{% set resource_event_name = resource_event_prefix ~ '.header' %} + +
    +
    + {{ sylius_template_event([resource_event_name, event_name], _context|merge({ event_prefix: event_name, resource_event_prefix: resource_event_name })) }} +
    +
    diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_content.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_content.html.twig index 71450a8907..a3c0b46154 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_content.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_content.html.twig @@ -1,6 +1,6 @@ -{% set event_name = _context.event_prefix ~ '.content' %} -{% set resource_event_name = _context.resource_event_prefix ~ '.content' %} +{% set event_name = event_prefix ~ '.content' %} +{% set resource_event_name = resource_event_prefix ~ '.content' %}
    - {{ sylius_template_event(event_name, { event_prefix: event_name, resource_event_prefix: resource_event_name }) }} + {{ sylius_template_event([resource_event_name, event_name], _context|merge({ event_prefix: event_name, resource_event_prefix: resource_event_name })) }}
    diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Header/_breadcrumbs.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Header/_breadcrumbs.html.twig new file mode 100644 index 0000000000..daa0d53a40 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Header/_breadcrumbs.html.twig @@ -0,0 +1,6 @@ +{% import '@SyliusAdmin/Shared/Helper/breadcrumbs.html.twig' as _breadcrumbs %} + +{{ _breadcrumbs.default([ + { 'name': 'Dashboard', 'url': path('sylius_admin_dashboard'), 'active': false }, + { 'name': metadata.applicationName~'.ui.'~metadata.pluralName, 'active': true }, +]) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/index.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/index.html.twig index 0397a89a87..ffded543b3 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/index.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/index.html.twig @@ -1,14 +1,13 @@ {% extends '@SyliusAdmin/Shared/Layout/base.html.twig' %} {% set definition = resources.definition %} -{% set data = resources.data %} {% set event_name = metadata.applicationName ~ '.admin.' ~ 'index.body' %} {% set resource_event_name = metadata.applicationName ~ '.admin.' ~ metadata.name ~ '.index.body' %} {% set header = configuration.vars.header|default(metadata.applicationName~'.ui.'~metadata.pluralName) %} -{% block title %}{{ header|trans }} {{ parent() }}{% endblock %} +{% block title %}{{ header|trans }} | {{ parent() }}{% endblock %} {% block body %} - {{ sylius_template_event(event_name, { event_prefix: event_name, resource_event_prefix: resource_event_name }) }} + {{ sylius_template_event([resource_event_name, event_name], { event_prefix: event_name, resource_event_prefix: resource_event_name, resources: resources, metadata: metadata, configuration: configuration }) }} {% endblock %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/breadcrumbs.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/breadcrumbs.html.twig new file mode 100644 index 0000000000..94564f3237 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/breadcrumbs.html.twig @@ -0,0 +1,14 @@ +{% macro default(breadcrumbs) %} +
      + {% dump(breadcrumbs) %} + {% for breadcrumb in breadcrumbs %} +
    1. + {% if breadcrumb.url is defined %} + {{ breadcrumb.name|trans }} + {% else %} + {{ breadcrumb.name|trans }} + {% endif %} +
      2. + {% endfor %} +
    +{% endmacro %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/header.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/header.html.twig new file mode 100644 index 0000000000..f3d9e5f669 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/header.html.twig @@ -0,0 +1,17 @@ +{% macro default(level, header, icon, subheader) %} + + {# TODO: Decide whether we want to have an image here #} + {# {% if icon is not empty %}#} + {# #} + {# {% endif %}#} + {{ header }} + {% if subheader is not empty %} + {# TODO: Fix subheader styling #} + {# {{ subheader }}#} + {% endif %} + +{% endmacro %} + +{% macro h1(header, icon, subheader) %} + {{ _self.default(1, header, icon, subheader) }} +{% endmacro %} From 852f7030e40b065eb0ad6b80b1f094ac6b949577 Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Sat, 23 Sep 2023 15:48:27 +0200 Subject: [PATCH 018/166] Add filters to the CRUD's index page --- .../Resources/config/app/config.yml | 11 ++++- .../config/app/template_events/crud.yaml | 6 +++ .../Index/Content/Grid/_filters.html.twig | 30 ++++++++++++ .../Crud/Index/Content/Grid/_table.twig | 0 .../Shared/Crud/Index/Content/_grid.html.twig | 49 +++++++++++++++++++ .../Shared/Grid/Filter/_boolean.html.twig | 3 ++ .../views/Shared/Grid/Filter/_date.html.twig | 10 ++++ .../Shared/Grid/Filter/_entities.html.twig | 3 ++ .../Shared/Grid/Filter/_entity.html.twig | 3 ++ .../Shared/Grid/Filter/_exists.html.twig | 3 ++ .../views/Shared/Grid/Filter/_money.html.twig | 11 +++++ .../Filter/_resourceAutocomplete.html.twig | 3 ++ .../Shared/Grid/Filter/_select.html.twig | 3 ++ .../Shared/Grid/Filter/_string.html.twig | 8 +++ .../views/Shared/Helper/accordion.html.twig | 39 +++++++++++++++ .../views/Shared/Helper/breadcrumbs.html.twig | 1 - .../views/Shared/Helper/table.html.twig | 0 17 files changed, 180 insertions(+), 3 deletions(-) create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/_filters.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/_table.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/_grid.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_boolean.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_date.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_entities.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_entity.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_exists.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_money.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_resourceAutocomplete.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_select.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_string.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/accordion.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/table.html.twig diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/config.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/config.yml index 35b0b07b08..03f01b3e4a 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/app/config.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/config.yml @@ -56,8 +56,15 @@ sylius_grid: update_product_positions: "@SyliusAdmin/Product/Grid/Action/updatePositions.html.twig" update_product_variant_positions: "@SyliusAdmin/ProductVariant/Grid/Action/updatePositions.html.twig" filter: - entities: '@SyliusUi/Grid/Filter/entities.html.twig' - resource_autocomplete: '@SyliusUi/Grid/Filter/resourceAutocomplete.html.twig' + boolean: '@SyliusAdmin/Shared/Grid/Filter/_boolean.html.twig' + date: '@SyliusAdmin/Shared/Grid/Filter/_date.html.twig' + entities: '@SyliusAdmin/Shared/Grid/Filter/_entities.html.twig' + entity: '@SyliusAdmin/Shared/Grid/Filter/_entity.html.twig' + exists: '@SyliusAdmin/Shared/Grid/Filter/_exists.html.twig' + money: '@SyliusAdmin/Shared/Grid/Filter/_money.html.twig' + resource_autocomplete: '@SyliusAdmin/Shared/Grid/Filter/_resourceAutocomplete.html.twig' + select: '@SyliusAdmin/Shared/Grid/Filter/_select.html.twig' + string: '@SyliusAdmin/Shared/Grid/Filter/_string.html.twig' liip_imagine: filter_sets: diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/crud.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/crud.yaml index 6ddaef15ab..05963b6944 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/crud.yaml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/crud.yaml @@ -12,6 +12,8 @@ sylius_ui: blocks: header: template: '@SyliusAdmin/Shared/Crud/Common/Content/_header.html.twig' + grid: + template: '@SyliusAdmin/Shared/Crud/Index/Content/_grid.html.twig' sylius.admin.index.body.content.header: blocks: breadcrumbs: @@ -24,3 +26,7 @@ sylius_ui: template: '@SyliusAdmin/Shared/Crud/Common/Content/Header/TitleBlock/_title.html.twig' actions: template: '@SyliusAdmin/Shared/Crud/Common/Content/Header/TitleBlock/_actions.html.twig' + sylius.admin.index.body.content.grid: + blocks: + filters: + template: '@SyliusAdmin/Shared/Crud/Index/Content/Grid/_filters.html.twig' diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/_filters.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/_filters.html.twig new file mode 100644 index 0000000000..3c805dd00e --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/_filters.html.twig @@ -0,0 +1,30 @@ +{% import "@SyliusAdmin/Shared/Helper/accordion.html.twig" as _accordion %} +{% import "@SyliusAdmin/Shared/Helper/button.html.twig" as _button %} + +{% set path = path(app.request.attributes.get('_route'), app.request.attributes.all('_route_params')) %} +{% set areCriteriaSet = app.request.query.has('criteria') %} + +
    + {% set content %} +
    +
    +
    + {% for filter in resources.definition.enabledFilters|filter(filter => filter.enabled)|sort_by('position') %} +
    + {{ sylius_grid_render_filter(resources, filter) }} +
    + {% endfor %} +
    +
    + {{ _button.primary({ text: 'sylius.ui.filter'|trans, type: 'submit' }) }} + {{ _button.default({ text: 'sylius.ui.reset'|trans, url: path }) }} +
    +
    +
    + {% endset %} + + {{ _accordion.default([{ + title: 'sylius.ui.filters'|trans, + content: content, + }], areCriteriaSet) }} +
    diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/_table.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/_table.twig new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/_grid.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/_grid.html.twig new file mode 100644 index 0000000000..0f931da87a --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/_grid.html.twig @@ -0,0 +1,49 @@ +{% from '@SyliusAdmin/Shared/Helper/icon.html.twig' import icon %} +{% import '@SyliusAdmin/Shared/Helper/table.html.twig' as _table %} + +{% set event_name = event_prefix ~ '.grid' %} +{% set resource_event_name = resource_event_prefix ~ '.grid' %} + +
    +
    + {{ sylius_template_event([resource_event_name, event_name], _context|merge({ event_prefix: event_name, resource_event_prefix: resource_event_name })) }} +{# {{ sylius_grid_render(resources, '@SyliusAdmin/Shared/Crud/Index/Content/Grid/_content.html.twig') }}#} +{# {{ sylius_template_event('sylius.grid.filters', _context) }}#} + +{#
    #} +{# {% block dataTable %}#} +{# {% if data|length > 0 %}#} +{#
    #} +{# #} +{# #} +{# #} +{# {{ _table.headers(grid, definition, app.request.attributes) }}#} +{# #} +{# #} +{# #} +{# {% for row in data %}#} +{# {{ _table.row(grid, definition, row) }}#} +{# {% endfor %}#} +{# #} +{#
    #} +{#
    #} +{# {% else %}#} +{#
    #} +{#
    #} +{#
    #} +{#

    {{ 'sylius.grid.no_results'|trans }}

    #} +{#

    #} +{# {{ 'sylius.grid.no_results_adjust_your_search'|trans }}#} +{#

    #} +{#
    #} +{# #} +{# {{ icon({ icon: 'plus' }) }}#} +{# {{ configuration.vars.no_result.create|default('sylius.grid.add_your_first.resource')|trans }}#} +{# #} +{#
    #} +{#
    #} +{# {% endif %}#} +{# {% endblock %}#} +{#
    #} +
    +
    diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_boolean.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_boolean.html.twig new file mode 100644 index 0000000000..2fe9d2f6f1 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_boolean.html.twig @@ -0,0 +1,3 @@ +{% form_theme form 'bootstrap_5_layout.html.twig' %} + +{{ form_row(form, {'label': filter.label}) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_date.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_date.html.twig new file mode 100644 index 0000000000..b6d6d14bd7 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_date.html.twig @@ -0,0 +1,10 @@ +{% form_theme form 'bootstrap_5_layout.html.twig' %} + +
    + {{ form_row(form.from, { attr: {'class': 'sylius-filters__group'}, 'label': 'sylius.ui.date_filter', 'label_translation_parameters': {'%label%': filter.label|trans, '%altLabel%': form.from.vars.label|trans} }) }} +
    + + +
    + {{ form_row(form.to, { attr: {'class': 'sylius-filters__group'} }) }} +
    diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_entities.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_entities.html.twig new file mode 100644 index 0000000000..2fe9d2f6f1 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_entities.html.twig @@ -0,0 +1,3 @@ +{% form_theme form 'bootstrap_5_layout.html.twig' %} + +{{ form_row(form, {'label': filter.label}) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_entity.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_entity.html.twig new file mode 100644 index 0000000000..2fe9d2f6f1 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_entity.html.twig @@ -0,0 +1,3 @@ +{% form_theme form 'bootstrap_5_layout.html.twig' %} + +{{ form_row(form, {'label': filter.label}) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_exists.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_exists.html.twig new file mode 100644 index 0000000000..2fe9d2f6f1 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_exists.html.twig @@ -0,0 +1,3 @@ +{% form_theme form 'bootstrap_5_layout.html.twig' %} + +{{ form_row(form, {'label': filter.label}) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_money.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_money.html.twig new file mode 100644 index 0000000000..ac7cd7257b --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_money.html.twig @@ -0,0 +1,11 @@ +{% form_theme form 'bootstrap_5_layout.html.twig' %} + +
    + {{ form_row(form.greaterThan, {attr: {'placeholder': form.greaterThan.vars.label}, 'label': 'sylius.ui.money_filter', 'label_translation_parameters': {'%label%': filter.label|trans, '%altLabel%': form.greaterThan.vars.label|trans}}) }} +
    + + +
    + {{ form_row(form.lessThan, {attr: { 'placeholder': form.lessThan.vars.label }}) }} + {{ form_row(form.currency) }} +
    diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_resourceAutocomplete.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_resourceAutocomplete.html.twig new file mode 100644 index 0000000000..458236c349 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_resourceAutocomplete.html.twig @@ -0,0 +1,3 @@ +{% form_theme form 'bootstrap_5_layout.html.twig' %} + +{{ form_row(form, {'label': filter.label, 'remote_url': path(filter.formOptions.remote_path), 'load_edit_url': path(filter.formOptions.load_edit_path)}) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_select.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_select.html.twig new file mode 100644 index 0000000000..2fe9d2f6f1 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_select.html.twig @@ -0,0 +1,3 @@ +{% form_theme form 'bootstrap_5_layout.html.twig' %} + +{{ form_row(form, {'label': filter.label}) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_string.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_string.html.twig new file mode 100644 index 0000000000..8d2c0b7f2a --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_string.html.twig @@ -0,0 +1,8 @@ +{% form_theme form 'bootstrap_5_layout.html.twig' %} + +
    + {% if form.type is defined %} + {{ form_row(form.type, {'label': filter.label}) }} + {% endif %} + {{ form_row(form.value, {attr: {placeholder: form.value.vars.label}, 'label': form.type is defined ? form.value.vars.label : filter.label}) }} +
    diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/accordion.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/accordion.html.twig new file mode 100644 index 0000000000..6ef0c81edf --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/accordion.html.twig @@ -0,0 +1,39 @@ +{% macro default(items, open = false, autoClose = null) %} + {% set autoClose = autoClose|default(true) %} + {% set id = id|default(random()) %} + +
    + {% for item in items %} + {% set item = { + 'open': open, + 'flag': null, + }|merge(item) %} + {% set item_id = item.id|default('collapse' ~ loop.index) %} + +
    +

    + +

    +
    + +
    + {{ item.content|default('Content') }} +
    +
    +
    + {% endfor %} +
    +{% endmacro %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/breadcrumbs.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/breadcrumbs.html.twig index 94564f3237..a98b746ed7 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/breadcrumbs.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/breadcrumbs.html.twig @@ -1,6 +1,5 @@ {% macro default(breadcrumbs) %}
      - {% dump(breadcrumbs) %} {% for breadcrumb in breadcrumbs %}
    1. {% if breadcrumb.url is defined %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/table.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/table.html.twig new file mode 100644 index 0000000000..e69de29bb2 From eda1e1df2b1ff95bb6350aa9dd5d8c2e98dab879 Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Sat, 23 Sep 2023 16:55:00 +0200 Subject: [PATCH 019/166] Add grid to the CRUD's index page --- .../Resources/assets/entrypoint.js | 1 + .../Resources/assets/images/no_data.svg | 10 +++++ .../config/app/template_events/crud.yaml | 14 ++++++ .../Resources/translations/messages.en.yml | 3 ++ .../Content/Grid/NoResults/_action.html.twig | 10 +++++ .../Content/Grid/NoResults/_image.html.twig | 5 +++ .../Grid/NoResults/_subtitle.html.twig | 5 +++ .../Content/Grid/NoResults/_title.html.twig | 3 ++ .../Index/Content/Grid/_dataTable.html.twig | 21 +++++++++ .../Index/Content/Grid/_noResults.html.twig | 10 +++++ .../Crud/Index/Content/Grid/_table.twig | 0 .../Shared/Crud/Index/Content/_grid.html.twig | 38 ---------------- .../views/Shared/Helper/table.html.twig | 45 +++++++++++++++++++ 13 files changed, 127 insertions(+), 38 deletions(-) create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/assets/images/no_data.svg create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/NoResults/_action.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/NoResults/_image.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/NoResults/_subtitle.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/NoResults/_title.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/_dataTable.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/_noResults.html.twig delete mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/_table.twig diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/entrypoint.js b/src/Sylius/Bundle/AdminBundle/Resources/assets/entrypoint.js index adb9723c04..c754186da1 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/assets/entrypoint.js +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/entrypoint.js @@ -14,5 +14,6 @@ import './scripts/choices'; import 'bootstrap'; +import './images/no_data.svg'; import './images/sylius-logo.svg'; import './images/sylius-logo-dark-text.png'; diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/images/no_data.svg b/src/Sylius/Bundle/AdminBundle/Resources/assets/images/no_data.svg new file mode 100644 index 0000000000..9ec1f0ab3e --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/images/no_data.svg @@ -0,0 +1,10 @@ + + + diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/crud.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/crud.yaml index 05963b6944..a6018161e5 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/crud.yaml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/crud.yaml @@ -30,3 +30,17 @@ sylius_ui: blocks: filters: template: '@SyliusAdmin/Shared/Crud/Index/Content/Grid/_filters.html.twig' + data_table: + template: '@SyliusAdmin/Shared/Crud/Index/Content/Grid/_dataTable.html.twig' + no_data_block: + template: '@SyliusAdmin/Shared/Crud/Index/Content/Grid/_noResults.html.twig' + sylius.admin.index.body.content.grid.no_results: + blocks: + image: + template: '@SyliusAdmin/Shared/Crud/Index/Content/Grid/NoResults/_image.html.twig' + title: + template: '@SyliusAdmin/Shared/Crud/Index/Content/Grid/NoResults/_title.html.twig' + subtitle: + template: '@SyliusAdmin/Shared/Crud/Index/Content/Grid/NoResults/_subtitle.html.twig' + action: + template: '@SyliusAdmin/Shared/Crud/Index/Content/Grid/NoResults/_action.html.twig' diff --git a/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.en.yml b/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.en.yml index 564a0691a4..79c217dc75 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.en.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.en.yml @@ -54,6 +54,7 @@ sylius: header: Sales orders: Orders ui: + add_new_entry: Add a new entry catalog_promotion: dates_details: This operation is time-consuming! Please consider a 2-10 minutes delay starting from the specified dates. The delay depends on the size of the catalog. channel: @@ -67,6 +68,8 @@ sylius: PayPal Commerce Platform integration. lowest_price_before_discount: 'Lowest price before discount' minimum_price_details: Minimum price - this is the pricing threshold below which the current price cannot be discounted by neither catalog nor cart promotions. Use this to guard the profitability of your sales. + no_results: No results found + no_results_adjust_your_search: 'Adjust your search and try again.' original_price_details: Original price - this is the price of the product variant It is displayed as crossed-out in the catalog. It is used as the base for current price calculations. If this value is not defined, Catalog Promotion logic will copy value from Price to Original Price. price_details: Price - this is the current price of the product variant displayed in the catalog. It can be modified explicitly by i.e. catalog promotions. price_history: Price history diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/NoResults/_action.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/NoResults/_action.html.twig new file mode 100644 index 0000000000..53b61edd0e --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/NoResults/_action.html.twig @@ -0,0 +1,10 @@ +{% from '@SyliusAdmin/Shared/Helper/icon.html.twig' import icon %} + +{% if _context.route is defined and (_context.hidden is not defined or _context.hidden == false) %} +
      + + {{ icon({ icon: _context.icon|default('plus') }) }} + {{ _context.translation_key|default('sylius.ui.add_new_entry')|trans }} + +
      +{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/NoResults/_image.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/NoResults/_image.html.twig new file mode 100644 index 0000000000..a7c3a3de0a --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/NoResults/_image.html.twig @@ -0,0 +1,5 @@ +{% if _context.hidden is not defined or _context.hidden == false %} +
      + +
      +{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/NoResults/_subtitle.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/NoResults/_subtitle.html.twig new file mode 100644 index 0000000000..25e5c100a2 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/NoResults/_subtitle.html.twig @@ -0,0 +1,5 @@ +{% if _context.hidden is not defined or _context.hidden == false %} +

      + {{ _context.translation_key|default('sylius.ui.no_results_adjust_your_search')|trans }} +

      +{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/NoResults/_title.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/NoResults/_title.html.twig new file mode 100644 index 0000000000..bbf86cf339 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/NoResults/_title.html.twig @@ -0,0 +1,3 @@ +{% if _context.hidden is not defined or _context.hidden == false %} +

      {{ _context.translation_key|default('sylius.ui.no_results')|trans }}

      +{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/_dataTable.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/_dataTable.html.twig new file mode 100644 index 0000000000..b56236fb92 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/_dataTable.html.twig @@ -0,0 +1,21 @@ +{% from '@SyliusAdmin/Shared/Helper/icon.html.twig' import icon %} +{% import '@SyliusAdmin/Shared/Helper/table.html.twig' as _table %} + +{% if resources.data|length > 0 %} +
      +
      + + + + {{ _table.headers(resources, resources.definition, app.request.attributes) }} + + + + {% for row in resources.data %} + {{ _table.row(resources, resources.definition, row) }} + {% endfor %} + +
      +
      +
      +{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/_noResults.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/_noResults.html.twig new file mode 100644 index 0000000000..13c7263e40 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/_noResults.html.twig @@ -0,0 +1,10 @@ +{% set event_name = event_prefix ~ '.no_results' %} +{% set resource_event_name = resource_event_prefix ~ '.no_results' %} + +{% if resources.data|length == 0 %} +
      +
      + {{ sylius_template_event([resource_event_name, event_name], _context|merge({ event_prefix: event_name, resource_event_prefix: resource_event_name })) }} +
      +
      +{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/_table.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/_table.twig deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/_grid.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/_grid.html.twig index 0f931da87a..f0893bda0f 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/_grid.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/_grid.html.twig @@ -7,43 +7,5 @@
      {{ sylius_template_event([resource_event_name, event_name], _context|merge({ event_prefix: event_name, resource_event_prefix: resource_event_name })) }} -{# {{ sylius_grid_render(resources, '@SyliusAdmin/Shared/Crud/Index/Content/Grid/_content.html.twig') }}#} -{# {{ sylius_template_event('sylius.grid.filters', _context) }}#} - -{#
      #} -{# {% block dataTable %}#} -{# {% if data|length > 0 %}#} -{#
      #} -{# #} -{# #} -{# #} -{# {{ _table.headers(grid, definition, app.request.attributes) }}#} -{# #} -{# #} -{# #} -{# {% for row in data %}#} -{# {{ _table.row(grid, definition, row) }}#} -{# {% endfor %}#} -{# #} -{#
      #} -{#
      #} -{# {% else %}#} -{#
      #} -{#
      #} -{#
      #} -{#

      {{ 'sylius.grid.no_results'|trans }}

      #} -{#

      #} -{# {{ 'sylius.grid.no_results_adjust_your_search'|trans }}#} -{#

      #} -{#
      #} -{# #} -{# {{ icon({ icon: 'plus' }) }}#} -{# {{ configuration.vars.no_result.create|default('sylius.grid.add_your_first.resource')|trans }}#} -{# #} -{#
      #} -{#
      #} -{# {% endif %}#} -{# {% endblock %}#} -{#
      #}
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/table.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/table.html.twig index e69de29bb2..a21433954e 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/table.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/table.html.twig @@ -0,0 +1,45 @@ +{% macro headers(grid, definition, requestAttributes) %} + {% import '@SyliusUi/Macro/sorting.html.twig' as sorting %} + + {% if definition.actionGroups.bulk is defined and definition.getEnabledActions('bulk')|length > 0 %} + + + + {% endif %} + + {% for field in definition.fields|sort_by('position') %} + {% if field.enabled %} + {% if field.isSortable %} + {{ sorting.tableHeader(grid, field, requestAttributes) }} + {% else %} + {{ field.label|trans }} + {% endif %} + {% endif %} + {% endfor %} + {% if definition.actionGroups.item is defined and definition.getEnabledActions('item')|length > 0 %} + {{ 'sylius.ui.actions'|trans }} + {% endif %} +{% endmacro %} + +{% macro row(grid, definition, row) %} + {% import '@SyliusAdmin/Shared/Helper/dropdown.html.twig' as dropdown %} + + + {% if definition.actionGroups.bulk is defined and definition.getEnabledActions('bulk')|length > 0 %} + + {% endif %} + {% for field in definition.enabledFields|sort_by('position') %} + {{ sylius_grid_render_field(grid, field, row) }} + {% endfor %} + {% if definition.actionGroups.item is defined and definition.getEnabledActions('item')|length > 0 %} + + {% set actions %} + {% for action in definition.getEnabledActions('item')|sort_by('position') %} + {{ sylius_grid_render_action(grid, action, row) }} + {% endfor %} + {% endset %} + {{ dropdown.default({ content: actions, button: { text: 'Actions' } }) }} + + {% endif %} + +{% endmacro %} From 430158aeef2c5eaced471ee540cad08e6fc231a1 Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Mon, 25 Sep 2023 08:51:36 +0200 Subject: [PATCH 020/166] Fix action buttons on the index page --- config/packages/_sylius.yaml | 4 +- .../DependencyInjection/Configuration.php | 10 +++ .../SyliusAdminExtension.php | 1 + .../Grid/Renderer/GridRendererInterface.php | 23 ++++++ .../Grid/Renderer/TwigGridRenderer.php | 81 +++++++++++++++++++ .../Resources/config/app/config.yml | 20 +++++ .../AdminBundle/Resources/config/services.xml | 5 ++ .../Resources/config/services/renderer.xml | 21 +++++ .../Header/TitleBlock/_actions.html.twig | 9 +-- .../Shared/Grid/Action/_create.html.twig | 13 +++ .../Shared/Grid/Action/_default.html.twig | 13 +++ .../views/Shared/Grid/Action/_link.html.twig | 3 + .../views/Shared/Grid/Action/_links.html.twig | 23 ++++++ .../ItemAction/_applyTransition.html.twig | 19 +++++ .../Shared/Grid/ItemAction/_archive.html.twig | 15 ++++ .../Shared/Grid/ItemAction/_create.html.twig | 13 +++ .../Shared/Grid/ItemAction/_default.html.twig | 7 ++ .../Shared/Grid/ItemAction/_delete.html.twig | 16 ++++ .../Shared/Grid/ItemAction/_link.html.twig | 3 + .../Shared/Grid/ItemAction/_links.html.twig | 24 ++++++ .../Shared/Grid/ItemAction/_show.html.twig | 13 +++ .../Shared/Grid/ItemAction/_update.html.twig | 13 +++ .../views/Shared/Helper/table.html.twig | 2 +- .../Bundle/AdminBundle/Twig/GridExtension.php | 36 +++++++++ 24 files changed, 378 insertions(+), 9 deletions(-) create mode 100644 src/Sylius/Bundle/AdminBundle/Grid/Renderer/GridRendererInterface.php create mode 100644 src/Sylius/Bundle/AdminBundle/Grid/Renderer/TwigGridRenderer.php create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/config/services/renderer.xml create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Action/_create.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Action/_default.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Action/_link.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Action/_links.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_applyTransition.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_archive.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_create.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_default.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_delete.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_link.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_links.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_show.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_update.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Twig/GridExtension.php diff --git a/config/packages/_sylius.yaml b/config/packages/_sylius.yaml index fa411e6185..8420b82616 100644 --- a/config/packages/_sylius.yaml +++ b/config/packages/_sylius.yaml @@ -1,12 +1,12 @@ imports: - { resource: "@SyliusCoreBundle/Resources/config/app/config.yml" } - - { resource: "@SyliusAdminBundle/Resources/config/app/config.yml" } - - { resource: "@SyliusShopBundle/Resources/config/app/config.yml" } - { resource: "@SyliusApiBundle/Resources/config/app/config.yaml" } + - { resource: "@SyliusAdminBundle/Resources/config/app/config.yml" } + parameters: sylius_core.public_dir: '%kernel.project_dir%/public' diff --git a/src/Sylius/Bundle/AdminBundle/DependencyInjection/Configuration.php b/src/Sylius/Bundle/AdminBundle/DependencyInjection/Configuration.php index 1ad7e16109..318c0cd3ea 100644 --- a/src/Sylius/Bundle/AdminBundle/DependencyInjection/Configuration.php +++ b/src/Sylius/Bundle/AdminBundle/DependencyInjection/Configuration.php @@ -38,6 +38,16 @@ final class Configuration implements ConfigurationInterface ->end() ->end() ->end() + ->arrayNode('templates') + ->addDefaultsIfNotSet() + ->children() + ->arrayNode('item_action') + ->useAttributeAsKey('name') + ->scalarPrototype()->end() + ->end() + ->end() + ->end() + ->end() ->end() ; diff --git a/src/Sylius/Bundle/AdminBundle/DependencyInjection/SyliusAdminExtension.php b/src/Sylius/Bundle/AdminBundle/DependencyInjection/SyliusAdminExtension.php index d083019de1..b6e9883bdc 100644 --- a/src/Sylius/Bundle/AdminBundle/DependencyInjection/SyliusAdminExtension.php +++ b/src/Sylius/Bundle/AdminBundle/DependencyInjection/SyliusAdminExtension.php @@ -28,6 +28,7 @@ final class SyliusAdminExtension extends Extension $container->setParameter('sylius.admin.notification.enabled', $config['notifications']['enabled']); $container->setParameter('sylius.admin.notification.frequency', $config['notifications']['frequency']); $container->setParameter('sylius.admin.shop_enabled', false); + $container->setParameter('sylius.admin.templates.item_action', $config['templates']['item_action']); $bundles = $container->getParameter('kernel.bundles'); if (array_key_exists('SyliusShopBundle', $bundles)) { diff --git a/src/Sylius/Bundle/AdminBundle/Grid/Renderer/GridRendererInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/Renderer/GridRendererInterface.php new file mode 100644 index 0000000000..79285d56ca --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Grid/Renderer/GridRendererInterface.php @@ -0,0 +1,23 @@ + $itemActionTemplates + */ + public function __construct ( + private BaseGridRendererInterface $decorated, + private Twig $twig, + private OptionsParserInterface $optionsParser, + private array $itemActionTemplates = [], + ) { + } + + public function render(GridViewInterface $gridView, ?string $template = null): string + { + return $this->decorated->render($gridView, $template); + } + + public function renderField(GridViewInterface $gridView, Field $field, $data): string + { + return $this->decorated->renderField($gridView, $field, $data); + } + + public function renderAction(GridViewInterface $gridView, Action $action, $data = null): string + { + return $this->decorated->renderAction($gridView, $action, $data); + } + + public function renderItemAction(GridViewInterface $gridView, Action $action, mixed $data = null): string + { + Assert::isInstanceOf($gridView, ResourceGridView::class); + + $type = $action->getType(); + if (!isset($this->itemActionTemplates[$type])) { + throw new \InvalidArgumentException(sprintf('Missing template for action type "%s".', $type)); + } + + $options = $this->optionsParser->parseOptions( + $action->getOptions(), + $gridView->getRequestConfiguration()->getRequest(), + $data, + ); + + return $this->twig->render($this->itemActionTemplates[$type], [ + 'grid' => $gridView, + 'action' => $action, + 'data' => $data, + 'options' => $options, + ]); } + + public function renderFilter(GridViewInterface $gridView, Filter $filter): string + { + return $this->decorated->renderFilter($gridView, $filter); + } +} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/config.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/config.yml index 03f01b3e4a..efb214caab 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/app/config.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/config.yml @@ -46,9 +46,29 @@ webpack_encore: builds: admin: '%kernel.project_dir%/public/build/admin' +sylius_admin: + templates: + item_action: + apply_transition: '@SyliusAdmin/Shared/Grid/ItemAction/_applyTransition.html.twig' + archive: '@SyliusAdmin/Shared/Grid/ItemAction/_archive.html.twig' + create: '@SyliusAdmin/Shared/Grid/ItemAction/_create.html.twig' + default: '@SyliusAdmin/Shared/Grid/ItemAction/_default.html.twig' + delete: '@SyliusAdmin/Shared/Grid/ItemAction/_delete.html.twig' + links: '@SyliusAdmin/Shared/Grid/ItemAction/_links.html.twig' + show: '@SyliusAdmin/Shared/Grid/ItemAction/_show.html.twig' + update: '@SyliusAdmin/Shared/Grid/ItemAction/_update.html.twig' + sylius_grid: templates: action: + apply_transition: '@SyliusAdmin/Shared/Grid/Action/_applyTransition.html.twig' + archive: '@SyliusAdmin/Shared/Grid/Action/_archive.html.twig' + create: '@SyliusAdmin/Shared/Grid/Action/_create.html.twig' + default: '@SyliusAdmin/Shared/Grid/Action/_default.html.twig' + delete: '@SyliusAdmin/Shared/Grid/Action/_delete.html.twig' + links: '@SyliusAdmin/Shared/Grid/Action/_links.html.twig' + show: '@SyliusAdmin/Shared/Grid/Action/_show.html.twig' + update: '@SyliusAdmin/Shared/Grid/Action/_update.html.twig' create_payment_method: "@SyliusAdmin/PaymentMethod/Grid/Action/create.html.twig" create_product_attribute: "@SyliusAdmin/ProductAttribute/Grid/Action/create.html.twig" generate_variants: "@SyliusAdmin/Product/Grid/Action/generateVariants.html.twig" diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/services.xml b/src/Sylius/Bundle/AdminBundle/Resources/config/services.xml index bdc9ce558e..33fa58705e 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/services.xml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/services.xml @@ -19,6 +19,7 @@ + @@ -75,6 +76,10 @@ + + + + diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/services/renderer.xml b/src/Sylius/Bundle/AdminBundle/Resources/config/services/renderer.xml new file mode 100644 index 0000000000..30f5682ed6 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/services/renderer.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + %sylius.admin.templates.item_action% + + + diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/Header/TitleBlock/_actions.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/Header/TitleBlock/_actions.html.twig index 4235115ee1..d30d2b9d4c 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/Header/TitleBlock/_actions.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/Header/TitleBlock/_actions.html.twig @@ -2,11 +2,8 @@
      {% if resources.definition.actionGroups.main is defined %} - {% set actions %} - {% for action in resources.definition.getEnabledActions('main') %} - {{ sylius_grid_render_action(resources, action, null) }} - {% endfor %} - {% endset %} - {{ _dropdown.default({ content: actions, button: { text: 'Actions' } }) }} + {% for action in resources.definition.getEnabledActions('main') %} + {{ sylius_grid_render_action(resources, action, null) }} + {% endfor %} {% endif %}
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Action/_create.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Action/_create.html.twig new file mode 100644 index 0000000000..f3564902fe --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Action/_create.html.twig @@ -0,0 +1,13 @@ +{% from '@SyliusAdmin/Shared/Helper/icon.html.twig' import icon %} + +{% set path = options.link.url|default(path(options.link.route|default(grid.requestConfiguration.getRouteName('create')), options.link.parameters|default([]))) %} + +{% set message = action.label %} +{% if message is empty %} + {% set message = 'sylius.ui.create' %} +{% endif %} + + + {{ icon({ icon: action.icon ?? 'plus', class: 'icon icon-tabler dropdown-item-icon' }) }} + {{ message|trans }} + diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Action/_default.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Action/_default.html.twig new file mode 100644 index 0000000000..5720ffb3be --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Action/_default.html.twig @@ -0,0 +1,13 @@ +{% from '@SyliusAdmin/Shared/Helper/icon.html.twig' import icon %} + +{% set path = options.link.url|default(path(options.link.route|default(grid.requestConfiguration.getRouteName('create')), options.link.parameters|default([]))) %} + +{% set message = action.label %} +{% if message is empty %} + {% set message = 'sylius.ui.create' %} +{% endif %} + + + {{ icon({ icon: action.icon ?? 'plus', class: 'icon icon-tabler dropdown-item-icon' }) }} + {{ message|trans }} + diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Action/_link.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Action/_link.html.twig new file mode 100644 index 0000000000..9d896c5b07 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Action/_link.html.twig @@ -0,0 +1,3 @@ +{% set path = link.url is defined ? link.url : path(link.route, link.parameters|default([])) %} + +{% if link.icon is defined %} {% endif %}{{ link.label|trans }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Action/_links.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Action/_links.html.twig new file mode 100644 index 0000000000..01d2421beb --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Action/_links.html.twig @@ -0,0 +1,23 @@ +{% set visible = options.visible is defined ? options.visible : true %} + +{% if visible %} +
      + +
        + {% if options.header is defined %} +
      • {{ options.header.label|trans }}
        • + {% endif %} + {% for link in options.links %} + {% set is_link_visible = link.visible is defined ? link.visible : true %} + + {% if is_link_visible %} + {% set path = link.url is defined ? link.url : path(link.route, link.parameters|default([])) %} + +
      • {% if link.icon is defined %} {% endif %}{{ link.label|trans }}
        • + {% endif %} + {% endfor %} +
      +
      +{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_applyTransition.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_applyTransition.html.twig new file mode 100644 index 0000000000..ebae2c7a60 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_applyTransition.html.twig @@ -0,0 +1,19 @@ +{% from '@SyliusAdmin/Shared/Helper/icon.html.twig' import icon %} + +{% set labeled = options.labeled is defined ? options.labeled : true %} + +{% if sm_can(data, options.transition, options.graph) %} +
      + + + +
      +{% else %} + +{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_archive.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_archive.html.twig new file mode 100644 index 0000000000..50cdc81832 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_archive.html.twig @@ -0,0 +1,15 @@ +{% set path = options.link.url|default(path(options.link.route|default(grid.requestConfiguration.getRouteName('archive')), options.link.parameters|default({'id': data.id}))) %} + +
      + + + + +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_create.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_create.html.twig new file mode 100644 index 0000000000..3e52151fd5 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_create.html.twig @@ -0,0 +1,13 @@ +{% from '@SyliusAdmin/Shared/Helper/icon.html.twig' import icon %} + +{% set path = options.link.url|default(path(options.link.route|default(grid.requestConfiguration.getRouteName('create')), options.link.parameters|default([]))) %} + +{% set message = action.label %} +{% if message is empty %} + {% set message = 'sylius.ui.create' %} +{% endif %} + + + {{ icon({ icon: action.icon ?? 'plus', class: 'icon icon-tabler dropdown-item-icon' }) }} + {{ message|trans }} + diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_default.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_default.html.twig new file mode 100644 index 0000000000..660b9b78a5 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_default.html.twig @@ -0,0 +1,7 @@ +{% set path = options.link.url|default(path(options.link.route, options.link.parameters|default({}))) %} + +{% set message = action.label %} + + + {% if message %}{{ message|trans }}{% endif %} + diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_delete.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_delete.html.twig new file mode 100644 index 0000000000..2ea4b84ffa --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_delete.html.twig @@ -0,0 +1,16 @@ +{% from '@SyliusAdmin/Shared/Helper/icon.html.twig' import icon %} + +{% set path = options.link.url|default(path(options.link.route|default(grid.requestConfiguration.getRouteName('delete')), options.link.parameters|default({'id': data.id}))) %} +{% set message = action.label %} + +{% if message is empty %} + {% set message = 'sylius.ui.delete' %} +{% endif %} + +
      + + + +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_link.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_link.html.twig new file mode 100644 index 0000000000..d094f2da1c --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_link.html.twig @@ -0,0 +1,3 @@ +{% set path = link.url is defined ? link.url : path(link.route, link.parameters|default([])) %} + +{% if link.icon is defined %} {% endif %}{{ link.label|trans }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_links.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_links.html.twig new file mode 100644 index 0000000000..e8b7e6bab5 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_links.html.twig @@ -0,0 +1,24 @@ +{% set visible = options.visible is defined ? options.visible : true %} + +{% if visible %} +
      + {% if options.icon is defined %}{% endif %} + {{ action.label|trans }} +
      + {% if options.header is defined %} +
      + {% if options.header.icon is defined %}{% endif %} + {{ options.header.label|trans }} +
      +
      + {% endif %} + {% for link in options.links %} + {% set is_link_visible = link.visible is defined ? link.visible : true %} + + {% if is_link_visible %} + {% include '@SyliusUi/Grid/Action/_link.html.twig' %} + {% endif %} + {% endfor %} +
      +
      +{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_show.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_show.html.twig new file mode 100644 index 0000000000..cfdf39a829 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_show.html.twig @@ -0,0 +1,13 @@ +{% from '@SyliusAdmin/Shared/Helper/icon.html.twig' import icon %} + +{% set path = options.link.url|default(path(options.link.route|default(grid.requestConfiguration.getRouteName('show')), options.link.parameters|default({'id': data.id}))) %} + +{% set message = action.label %} +{% if message is empty %} + {% set message = 'sylius.ui.show' %} +{% endif %} + + + {{ icon({ icon: action.icon ?? 'eye', class: 'icon icon-tabler dropdown-item-icon' }) }} + {{ message|trans }} + diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_update.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_update.html.twig new file mode 100644 index 0000000000..6186326dd8 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/ItemAction/_update.html.twig @@ -0,0 +1,13 @@ +{% from '@SyliusAdmin/Shared/Helper/icon.html.twig' import icon %} + +{% set path = options.link.url|default(path(options.link.route|default(grid.requestConfiguration.getRouteName('update')), options.link.parameters|default({'id': data.id}))) %} + +{% set message = action.label %} +{% if message is empty %} + {% set message = 'sylius.ui.edit' %} +{% endif %} + + + {{ icon({ icon: action.icon ?? 'pencil', class: 'icon icon-tabler dropdown-item-icon' }) }} + {{ message|trans }} + diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/table.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/table.html.twig index a21433954e..0fd08ad95a 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/table.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/table.html.twig @@ -35,7 +35,7 @@ {% set actions %} {% for action in definition.getEnabledActions('item')|sort_by('position') %} - {{ sylius_grid_render_action(grid, action, row) }} + {{ sylius_grid_render_item_action(grid, action, row) }} {% endfor %} {% endset %} {{ dropdown.default({ content: actions, button: { text: 'Actions' } }) }} diff --git a/src/Sylius/Bundle/AdminBundle/Twig/GridExtension.php b/src/Sylius/Bundle/AdminBundle/Twig/GridExtension.php new file mode 100644 index 0000000000..160b60c5c6 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Twig/GridExtension.php @@ -0,0 +1,36 @@ + + */ + public function getFunctions(): array + { + return [ + new TwigFunction('sylius_grid_render_item_action', [$this->gridRenderer, 'renderItemAction'], ['is_safe' => ['html']]), + ]; + } +} From 82135427586031200a862a4f41eeaa55e990efa3 Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Mon, 25 Sep 2023 09:05:41 +0200 Subject: [PATCH 021/166] Fix static analysis --- .../AdminBundle/Grid/Renderer/GridRendererInterface.php | 2 +- .../TwigComponent/Shared/Navbar/UserDropdown.php | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Sylius/Bundle/AdminBundle/Grid/Renderer/GridRendererInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/Renderer/GridRendererInterface.php index 79285d56ca..897213ff0d 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/Renderer/GridRendererInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/Renderer/GridRendererInterface.php @@ -19,5 +19,5 @@ use Sylius\Component\Grid\View\GridViewInterface; interface GridRendererInterface extends BaseGridRendererInterface { - public function renderItemAction(GridViewInterface $gridView, Action $action, mixed $data = null); + public function renderItemAction(GridViewInterface $gridView, Action $action, mixed $data = null): string; } diff --git a/src/Sylius/Bundle/AdminBundle/TwigComponent/Shared/Navbar/UserDropdown.php b/src/Sylius/Bundle/AdminBundle/TwigComponent/Shared/Navbar/UserDropdown.php index 69deffad77..bfdc04ff4e 100644 --- a/src/Sylius/Bundle/AdminBundle/TwigComponent/Shared/Navbar/UserDropdown.php +++ b/src/Sylius/Bundle/AdminBundle/TwigComponent/Shared/Navbar/UserDropdown.php @@ -41,11 +41,17 @@ final class UserDropdown } /** - * @return array + * @return array> + * + * @psalm-suppress InvalidReturnType */ #[ExposeInTemplate] public function getMenuItems(): array { + /** + * @phpstan-ignore-next-line PHPStan complains the declared return type does not match the returned value + * @psalm-suppress InvalidReturnStatement + */ return [ [ 'title' => $this->translator->trans('sylius.ui.my_account'), From 2b4c8f5c49022aa0356e926f5da8ce3ba6ad8541 Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Mon, 25 Sep 2023 11:43:09 +0200 Subject: [PATCH 022/166] Fix icons in the sidebar --- .../AdminBundle/Menu/MainMenuBuilder.php | 26 ++++++++++++++++--- .../Resources/config/services/menu.xml | 1 + .../Crud/Common/Sidebar/Menu/_menu.html.twig | 1 - .../views/Shared/Helper/avatar.html.twig | 8 +++++- 4 files changed, 31 insertions(+), 5 deletions(-) diff --git a/src/Sylius/Bundle/AdminBundle/Menu/MainMenuBuilder.php b/src/Sylius/Bundle/AdminBundle/Menu/MainMenuBuilder.php index a98810d1de..4daf57aa04 100644 --- a/src/Sylius/Bundle/AdminBundle/Menu/MainMenuBuilder.php +++ b/src/Sylius/Bundle/AdminBundle/Menu/MainMenuBuilder.php @@ -17,19 +17,24 @@ use Knp\Menu\FactoryInterface; use Knp\Menu\ItemInterface; use Sylius\Bundle\UiBundle\Menu\Event\MenuBuilderEvent; use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Component\Routing\RouterInterface; -final class MainMenuBuilder +final readonly class MainMenuBuilder { public const EVENT_NAME = 'sylius.menu.admin.main'; - public function __construct(private FactoryInterface $factory, private EventDispatcherInterface $eventDispatcher) - { + public function __construct( + private FactoryInterface $factory, + private EventDispatcherInterface $eventDispatcher, + private RouterInterface $router, + ) { } public function createMenu(array $options): ItemInterface { $menu = $this->factory->createItem('root'); + $this->addDashboardSubmenu($menu); $this->addCatalogSubMenu($menu); $this->addSalesSubMenu($menu); $this->addCustomersSubMenu($menu); @@ -41,11 +46,22 @@ final class MainMenuBuilder return $menu; } + private function addDashboardSubmenu(ItemInterface $menu): void + { + $menu + ->addChild('dashboard') + ->setLabel('sylius.ui.dashboard') + ->setLabelAttribute('icon', 'dashboard') + ->setUri($this->router->generate('sylius_admin_dashboard')) + ; + } + private function addCatalogSubMenu(ItemInterface $menu): void { $catalog = $menu ->addChild('catalog') ->setLabel('sylius.menu.admin.main.catalog.header') + ->setLabelAttribute('icon', 'list-details') ; $catalog @@ -111,6 +127,7 @@ final class MainMenuBuilder $customers = $menu ->addChild('customers') ->setLabel('sylius.menu.admin.main.customers.header') + ->setLabelAttribute('icon', 'users') ; $customers @@ -138,6 +155,7 @@ final class MainMenuBuilder $marketing = $menu ->addChild('marketing') ->setLabel('sylius.menu.admin.main.marketing.header') + ->setLabelAttribute('icon', 'percentage') ; $marketing @@ -177,6 +195,7 @@ final class MainMenuBuilder $sales = $menu ->addChild('sales') ->setLabel('sylius.menu.admin.main.sales.header') + ->setLabelAttribute('icon', 'shopping-bag') ; $sales @@ -209,6 +228,7 @@ final class MainMenuBuilder $configuration = $menu ->addChild('configuration') ->setLabel('sylius.menu.admin.main.configuration.header') + ->setLabelAttribute('icon', 'adjustments') ; $configuration diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/services/menu.xml b/src/Sylius/Bundle/AdminBundle/Resources/config/services/menu.xml index 65fe8a65e6..06fb7b2aa2 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/services/menu.xml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/services/menu.xml @@ -24,6 +24,7 @@ + diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Sidebar/Menu/_menu.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Sidebar/Menu/_menu.html.twig index d9ef62fd69..6b3c65508f 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Sidebar/Menu/_menu.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Sidebar/Menu/_menu.html.twig @@ -61,7 +61,6 @@
      2. {% else %} - {# TODO: Dashboard is not highlighted when selected #}
    2. diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/avatar.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/avatar.html.twig index c03ed4cc2d..2fc03bd40f 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/avatar.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/avatar.html.twig @@ -1,6 +1,12 @@ {% macro default(img, content, class) %} + {% from '@SyliusAdmin/Shared/Helper/icon.html.twig' import icon %} + - {{ content ? content }} + {% if content %} + {{ content }} + {% else %} + {{ icon({ icon: 'user' }) }} + {% endif %} {% endmacro %} From 05e8cd40eec9ef86cdc93c41f82159f75c8a4513 Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Mon, 25 Sep 2023 13:25:14 +0200 Subject: [PATCH 023/166] Add pagination and batch actions --- .../Resources/config/app/config.yml | 2 ++ .../Index/Content/Grid/_dataTable.html.twig | 21 ++++++++++++++++++- .../Shared/Grid/BulkAction/_delete.html.twig | 9 ++++++++ .../views/Shared/Helper/button.html.twig | 4 ++-- .../views/Shared/Helper/pagination.html.twig | 13 ++++++++++++ 5 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/BulkAction/_delete.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/pagination.html.twig diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/config.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/config.yml index efb214caab..3551a1e0a2 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/app/config.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/config.yml @@ -75,6 +75,8 @@ sylius_grid: ship_with_tracking_code: "@SyliusAdmin/Shipment/Grid/Action/shipWithTrackingCode.html.twig" update_product_positions: "@SyliusAdmin/Product/Grid/Action/updatePositions.html.twig" update_product_variant_positions: "@SyliusAdmin/ProductVariant/Grid/Action/updatePositions.html.twig" + bulk_action: + delete: '@SyliusAdmin/Shared/Grid/BulkAction/_delete.html.twig' filter: boolean: '@SyliusAdmin/Shared/Grid/Filter/_boolean.html.twig' date: '@SyliusAdmin/Shared/Grid/Filter/_date.html.twig' diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/_dataTable.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/_dataTable.html.twig index b56236fb92..75b59ec0d4 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/_dataTable.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/_dataTable.html.twig @@ -1,8 +1,27 @@ {% from '@SyliusAdmin/Shared/Helper/icon.html.twig' import icon %} {% import '@SyliusAdmin/Shared/Helper/table.html.twig' as _table %} +{% import '@SyliusAdmin/Shared/Helper/pagination.html.twig' as _pagination %} -{% if resources.data|length > 0 %} +{% set grid = _context.resources %} +{% set data = grid.data %} +{% set definition = grid.definition %} + +{% if data|length > 0 %}
      +
      +
      + {% if data|length > 0 and definition.actionGroups.bulk is defined and definition.getEnabledActions('bulk')|length > 0 %} +
      + {% for action in definition.getEnabledActions('bulk') %} + {{ sylius_grid_render_bulk_action(grid, action, null) }} + {% endfor %} +
      + {% endif %} +
      + {{ _pagination.perPage(data, definition.limits) }} +
      +
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/BulkAction/_delete.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/BulkAction/_delete.html.twig new file mode 100644 index 0000000000..ffbb0d3172 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/BulkAction/_delete.html.twig @@ -0,0 +1,9 @@ +{% import '@SyliusAdmin/Shared/Helper/button.html.twig' as _button %} + +{% set path = options.link.url|default(path(options.link.route|default(grid.requestConfiguration.getRouteName('bulk_delete')), options.link.parameters|default({}))) %} + + + + + {{ _button.delete({ text: action.label|default('sylius.ui.delete')|trans, disabled: true, type: 'submit', icon: 'trash-x' }) }} + diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/button.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/button.html.twig index 2bb4bdd533..ed7efd5639 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/button.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/button.html.twig @@ -1,6 +1,6 @@ -{% from '@SyliusAdmin/Shared/Helper/icon.html.twig' import icon as i %} - {% macro default(params = {}) %} + {% from '@SyliusAdmin/Shared/Helper/icon.html.twig' import icon as i %} + {% set p = { attr: null, class: null, diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/pagination.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/pagination.html.twig new file mode 100644 index 0000000000..93e44634cf --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/pagination.html.twig @@ -0,0 +1,13 @@ +{% macro perPage(paginator, paginationLimits) %} +
      + +
      + {% for limit in paginationLimits|filter(limit => limit != paginator.maxPerPage) %} + {% set path = path(app.request.attributes.get('_route'), app.request.attributes.all('_route_params')|merge(app.request.query)|merge({'limit': limit})) %} + {{ limit }} + {% endfor %} +
      +
      +{% endmacro %} From 0cc1e7e99070b53b94b24e609e263448b0d4b43a Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Mon, 25 Sep 2023 14:17:34 +0200 Subject: [PATCH 024/166] Add handling flashes --- .../Resources/assets/styles/_alert.scss | 14 +++++++++ .../Resources/assets/styles/_avatar.scss | 3 ++ .../Resources/assets/styles/main.scss | 1 + .../config/app/template_events/crud.yaml | 2 ++ .../Crud/Common/Content/_flashes.html.twig | 29 +++++++++++++++++++ .../views/Shared/Helper/icon.html.twig | 25 ++++++++++++++++ 6 files changed, 74 insertions(+) create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_alert.scss create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/_flashes.html.twig diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_alert.scss b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_alert.scss new file mode 100644 index 0000000000..d5573a82ad --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_alert.scss @@ -0,0 +1,14 @@ +/*! + * This file is part of the Sylius package. + * + * (c) Sylius Sp. z o.o. + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +.sylius { + &.alert { + background-color: #fff; + } +} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_avatar.scss b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_avatar.scss index afb9a2e9c2..228cfa1644 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_avatar.scss +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_avatar.scss @@ -11,4 +11,7 @@ &.avatar { background-color: $gray-100; } + &.alert { + background-color: #fff; + } } diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/main.scss b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/main.scss index d83aadabab..eeaff9c5ea 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/main.scss +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/main.scss @@ -23,5 +23,6 @@ body { font-feature-settings: "cv03", "cv04", "cv11"; } +@import "alert"; @import "avatar"; @import "navbar"; diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/crud.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/crud.yaml index a6018161e5..ef3034b934 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/crud.yaml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/crud.yaml @@ -10,6 +10,8 @@ sylius_ui: template: '@SyliusAdmin/Shared/Crud/Common/_content.html.twig' sylius.admin.index.body.content: blocks: + flashes: + template: '@SyliusAdmin/Shared/Crud/Common/Content/_flashes.html.twig' header: template: '@SyliusAdmin/Shared/Crud/Common/Content/_header.html.twig' grid: diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/_flashes.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/_flashes.html.twig new file mode 100644 index 0000000000..302ff795ea --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/_flashes.html.twig @@ -0,0 +1,29 @@ +{% if app.session is not null and app.session.started %} + {% from '@SyliusAdmin/Shared/Helper/icon.html.twig' import icon as _icon %} +
      + {% for type in ['success', 'error', 'info', 'warning'] %} + {% for flash in app.session.flashbag.get(type) %} + + {% endfor %} + {% endfor %} +
      +{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/icon.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/icon.html.twig index f05fb27beb..31367ac7d6 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/icon.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/icon.html.twig @@ -231,5 +231,30 @@ {% endif %} + + {% if icon == 'danger' %} + + + + + {% endif %} + + {% if icon == 'warning' %} + + + + {% endif %} + + {% if icon == 'info' %} + + + + + {% endif %} + + {% if icon == 'success' %} + + + {% endif %} {% endmacro %} From c25bccbd9b59333f4241ff46172eebd6ced46c6d Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Mon, 25 Sep 2023 14:50:06 +0200 Subject: [PATCH 025/166] Fix batch checkboxes styling --- .../AdminBundle/Resources/views/Shared/Helper/table.html.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/table.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/table.html.twig index 0fd08ad95a..f10d1d81d4 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/table.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/table.html.twig @@ -3,7 +3,7 @@ {% if definition.actionGroups.bulk is defined and definition.getEnabledActions('bulk')|length > 0 %}       {% endif %} @@ -26,7 +26,7 @@ {% if definition.actionGroups.bulk is defined and definition.getEnabledActions('bulk')|length > 0 %} - + {% endif %} {% for field in definition.enabledFields|sort_by('position') %} From ec839c5cd592ab6d9e7c7edebdf73350830f37e8 Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Mon, 25 Sep 2023 14:53:49 +0200 Subject: [PATCH 026/166] Fix channel badge color on the index page --- .../AdminBundle/Resources/views/Common/_channel.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Common/_channel.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Common/_channel.html.twig index 3aaa9148f7..e68b752d50 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Common/_channel.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Common/_channel.html.twig @@ -1,6 +1,6 @@ {% if channel is defined %}
      - + {{ channel.name|default(channel.code) }} From 04f4a8124804cd6f5ea98b43512f974193667702 Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Tue, 26 Sep 2023 09:35:30 +0200 Subject: [PATCH 027/166] Add a default create page --- .../config/app/template_events/crud.yaml | 31 ++++++++++++++++ .../Resources/config/routing/admin_user.yml | 2 +- .../config/routing/catalog_promotion.yaml | 2 +- .../Resources/config/routing/channel.yml | 2 +- .../Resources/config/routing/country.yml | 2 +- .../Resources/config/routing/currency.yml | 2 +- .../Resources/config/routing/customer.yml | 2 +- .../config/routing/customer_group.yml | 2 +- .../config/routing/exchange_rate.yml | 2 +- .../Resources/config/routing/locale.yml | 2 +- .../Resources/config/routing/order.yml | 2 +- .../Resources/config/routing/payment.yml | 2 +- .../config/routing/payment_method.yml | 2 +- .../Resources/config/routing/product.yml | 2 +- .../routing/product_association_type.yml | 2 +- .../config/routing/product_attribute.yml | 2 +- .../config/routing/product_option.yml | 2 +- .../config/routing/product_review.yml | 2 +- .../Resources/config/routing/promotion.yml | 2 +- .../Resources/config/routing/shipment.yml | 2 +- .../config/routing/shipping_category.yml | 2 +- .../config/routing/shipping_method.yml | 2 +- .../Resources/config/routing/tax_category.yml | 2 +- .../Resources/config/routing/tax_rate.yml | 2 +- .../Resources/config/routing/zone.yml | 2 +- .../Resources/translations/messages.en.yml | 2 ++ .../Header/TitleBlock/_title.html.twig | 10 ++++++ .../Content/Header/_breadcrumbs.html.twig | 13 +++++++ .../Crud/Create/Content/_form.html.twig | 36 +++++++++++++++++++ .../views/Shared/Crud/create.html.twig | 12 +++++++ .../views/Shared/Helper/button.html.twig | 2 ++ .../Resources/translations/messages.en.yml | 1 + 32 files changed, 131 insertions(+), 24 deletions(-) create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Create/Content/Header/TitleBlock/_title.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Create/Content/Header/_breadcrumbs.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Create/Content/_form.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/create.html.twig diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/crud.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/crud.yaml index ef3034b934..29889e3538 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/crud.yaml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/crud.yaml @@ -1,5 +1,6 @@ sylius_ui: events: + # Index sylius.admin.index.body: blocks: sidebar: @@ -46,3 +47,33 @@ sylius_ui: template: '@SyliusAdmin/Shared/Crud/Index/Content/Grid/NoResults/_subtitle.html.twig' action: template: '@SyliusAdmin/Shared/Crud/Index/Content/Grid/NoResults/_action.html.twig' + + # Create + sylius.admin.create.body: + blocks: + sidebar: + template: '@SyliusAdmin/Shared/Crud/Common/_sidebar.html.twig' + navbar: + template: '@SyliusAdmin/Shared/Crud/Common/_navbar.html.twig' + content: + template: '@SyliusAdmin/Shared/Crud/Common/_content.html.twig' + sylius.admin.create.body.content: + blocks: + flashes: + template: '@SyliusAdmin/Shared/Crud/Common/Content/_flashes.html.twig' + header: + template: '@SyliusAdmin/Shared/Crud/Common/Content/_header.html.twig' + form: + template: '@SyliusAdmin/Shared/Crud/Create/Content/_form.html.twig' + context: + render_rest: true + sylius.admin.create.body.content.header: + blocks: + breadcrumbs: + template: '@SyliusAdmin/Shared/Crud/Create/Content/Header/_breadcrumbs.html.twig' + title_block: + template: '@SyliusAdmin/Shared/Crud/Common/Content/Header/_titleBlock.html.twig' + sylius.admin.create.body.content.header.title_block: + blocks: + title: + template: '@SyliusAdmin/Shared/Crud/Create/Content/Header/TitleBlock/_title.html.twig' diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/admin_user.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/admin_user.yml index 6041309145..6204382758 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/admin_user.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/admin_user.yml @@ -3,7 +3,7 @@ sylius_admin_admin_user: alias: sylius.admin_user section: admin path: users - templates: "@SyliusAdmin\\Crud" + templates: "@SyliusAdmin\\Shared\\Crud" except: ['show'] redirect: index grid: sylius_admin_admin_user diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/catalog_promotion.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/catalog_promotion.yaml index 078acd2459..f9d462f721 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/catalog_promotion.yaml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/catalog_promotion.yaml @@ -2,7 +2,7 @@ sylius_admin_catalog_promotion: resource: | alias: sylius.catalog_promotion section: admin - templates: "@SyliusAdmin\\Crud" + templates: "@SyliusAdmin\\Shared\\Crud" only: ['index', 'create', 'update'] redirect: update grid: sylius_admin_catalog_promotion diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/channel.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/channel.yml index 01ade1b3b2..0d6d0726ce 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/channel.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/channel.yml @@ -2,7 +2,7 @@ sylius_admin_channel: resource: | alias: sylius.channel section: admin - templates: "@SyliusAdmin\\Crud" + templates: "@SyliusAdmin\\Shared\\Crud" except: ['show'] redirect: update grid: sylius_admin_channel diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/country.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/country.yml index d46197b1fd..6432f195f4 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/country.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/country.yml @@ -2,7 +2,7 @@ sylius_admin_country: resource: | alias: sylius.country section: admin - templates: "@SyliusAdmin\\Crud" + templates: "@SyliusAdmin\\Shared\\Crud" except: ['show', 'delete'] redirect: update grid: sylius_admin_country diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/currency.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/currency.yml index 657204e86f..14f1fc431f 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/currency.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/currency.yml @@ -2,7 +2,7 @@ sylius_admin_currency: resource: | alias: sylius.currency section: admin - templates: "@SyliusAdmin\\Crud" + templates: "@SyliusAdmin\\Shared\\Crud" except: ['show', 'delete'] redirect: update grid: sylius_admin_currency diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/customer.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/customer.yml index cbd29e68af..0ce33937d7 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/customer.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/customer.yml @@ -2,7 +2,7 @@ sylius_admin_customer: resource: | alias: sylius.customer section: admin - templates: "@SyliusAdmin\\Crud" + templates: "@SyliusAdmin\\Shared\\Crud" except: ['show', 'delete'] redirect: update grid: sylius_admin_customer diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/customer_group.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/customer_group.yml index 7163b1ae24..b749fb776f 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/customer_group.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/customer_group.yml @@ -2,7 +2,7 @@ sylius_admin_customer_group: resource: | alias: sylius.customer_group section: admin - templates: "@SyliusAdmin\\Crud" + templates: "@SyliusAdmin\\Shared\\Crud" except: ['show'] redirect: update grid: sylius_admin_customer_group diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/exchange_rate.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/exchange_rate.yml index 85204fe12b..4d3ecf6b38 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/exchange_rate.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/exchange_rate.yml @@ -2,7 +2,7 @@ sylius_admin_exchange_rate: resource: | alias: sylius.exchange_rate section: admin - templates: "@SyliusAdmin\\Crud" + templates: "@SyliusAdmin\\Shared\\Crud" except: ['show'] redirect: update grid: sylius_admin_exchange_rate diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/locale.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/locale.yml index 726ef516bc..7ebe86a5ca 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/locale.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/locale.yml @@ -2,7 +2,7 @@ sylius_admin_locale: resource: | alias: sylius.locale section: admin - templates: "@SyliusAdmin\\Crud" + templates: "@SyliusAdmin\\Shared\\Crud" except: ['show', 'delete'] redirect: index grid: sylius_admin_locale diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/order.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/order.yml index cace218010..8667339a41 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/order.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/order.yml @@ -2,7 +2,7 @@ sylius_admin_order: resource: | alias: sylius.order section: admin - templates: "@SyliusAdmin\\Crud" + templates: "@SyliusAdmin\\Shared\\Crud" only: ['index'] grid: sylius_admin_order permission: true diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/payment.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/payment.yml index 8d90555e73..cba37a6207 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/payment.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/payment.yml @@ -2,7 +2,7 @@ sylius_admin_payment: resource: | alias: sylius.payment section: admin - templates: "@SyliusAdmin\\Crud" + templates: "@SyliusAdmin\\Shared\\Crud" only: ['index'] grid: sylius_admin_payment permission: true diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/payment_method.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/payment_method.yml index b5952e1d4b..b2507fd793 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/payment_method.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/payment_method.yml @@ -2,7 +2,7 @@ sylius_admin_payment_method: resource: | alias: sylius.payment_method section: admin - templates: "@SyliusAdmin\\Crud" + templates: "@SyliusAdmin\\Shared\\Crud" except: ['show'] redirect: update grid: sylius_admin_payment_method diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product.yml index b69dd741e4..59161179e7 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product.yml @@ -2,7 +2,7 @@ sylius_admin_product: resource: | alias: sylius.product section: admin - templates: "@SyliusAdmin\\Crud" + templates: "@SyliusAdmin\\Shared\\Crud" except: ['index', 'update'] redirect: update grid: sylius_admin_product diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product_association_type.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product_association_type.yml index 6cf9904c8f..4c65be527a 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product_association_type.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product_association_type.yml @@ -3,7 +3,7 @@ sylius_admin_product_association_type: alias: sylius.product_association_type section: admin permission: true - templates: "@SyliusAdmin\\Crud" + templates: "@SyliusAdmin\\Shared\\Crud" except: ['show'] redirect: update grid: sylius_admin_product_association_type diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product_attribute.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product_attribute.yml index 9fd27c15ee..11a8af7957 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product_attribute.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product_attribute.yml @@ -2,7 +2,7 @@ sylius_admin_product_attribute: resource: | alias: sylius.product_attribute section: admin - templates: "@SyliusAdmin\\Crud" + templates: "@SyliusAdmin\\Shared\\Crud" except: ['show', 'create'] redirect: update grid: sylius_admin_product_attribute diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product_option.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product_option.yml index bc0383d068..9a81648d00 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product_option.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product_option.yml @@ -2,7 +2,7 @@ sylius_admin_product_option: resource: | alias: sylius.product_option section: admin - templates: "@SyliusAdmin\\Crud" + templates: "@SyliusAdmin\\Shared\\Crud" except: ['show'] redirect: update grid: sylius_admin_product_option diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product_review.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product_review.yml index 6594d37956..16fb8ef04c 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product_review.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product_review.yml @@ -3,7 +3,7 @@ sylius_admin_product_review: alias: sylius.product_review section: admin permission: true - templates: "@SyliusAdmin\\Crud" + templates: "@SyliusAdmin\\Shared\\Crud" except: ['show', 'create'] redirect: update grid: sylius_admin_product_review diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/promotion.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/promotion.yml index 9e9c757342..0f6a0a51ca 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/promotion.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/promotion.yml @@ -2,7 +2,7 @@ sylius_admin_promotion: resource: | alias: sylius.promotion section: admin - templates: "@SyliusAdmin\\Crud" + templates: "@SyliusAdmin\\Shared\\Crud" except: ['show'] redirect: update grid: sylius_admin_promotion diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/shipment.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/shipment.yml index 1a23f19849..58479ed8b7 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/shipment.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/shipment.yml @@ -2,7 +2,7 @@ sylius_admin_shipment: resource: | alias: sylius.shipment section: admin - templates: "@SyliusAdmin\\Crud" + templates: "@SyliusAdmin\\Shared\\Crud" only: ['index'] grid: sylius_admin_shipment permission: true diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/shipping_category.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/shipping_category.yml index 09988cb049..4ed3a164ee 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/shipping_category.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/shipping_category.yml @@ -2,7 +2,7 @@ sylius_admin_shipping_category: resource: | alias: sylius.shipping_category section: admin - templates: "@SyliusAdmin\\Crud" + templates: "@SyliusAdmin\\Shared\\Crud" except: ['show'] redirect: update grid: sylius_admin_shipping_category diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/shipping_method.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/shipping_method.yml index b4b66832e6..fc91eba921 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/shipping_method.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/shipping_method.yml @@ -2,7 +2,7 @@ sylius_admin_shipping_method: resource: | alias: sylius.shipping_method section: admin - templates: "@SyliusAdmin\\Crud" + templates: "@SyliusAdmin\\Shared\\Crud" except: ['show'] redirect: update grid: sylius_admin_shipping_method diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/tax_category.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/tax_category.yml index 84b12ec797..da90ca052f 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/tax_category.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/tax_category.yml @@ -2,7 +2,7 @@ sylius_admin_tax_category: resource: | alias: sylius.tax_category section: admin - templates: "@SyliusAdmin\\Crud" + templates: "@SyliusAdmin\\Shared\\Crud" except: ['show'] redirect: update grid: sylius_admin_tax_category diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/tax_rate.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/tax_rate.yml index f69b2ae543..7da008a3f2 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/tax_rate.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/tax_rate.yml @@ -2,7 +2,7 @@ sylius_admin_tax_rate: resource: | alias: sylius.tax_rate section: admin - templates: "@SyliusAdmin\\Crud" + templates: "@SyliusAdmin\\Shared\\Crud" except: ['show'] redirect: update grid: sylius_admin_tax_rate diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/zone.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/zone.yml index f44a60a84d..b5deaec152 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/zone.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/zone.yml @@ -2,7 +2,7 @@ sylius_admin_zone: resource: | alias: sylius.zone section: admin - templates: "@SyliusAdmin\\Crud" + templates: "@SyliusAdmin\\Shared\\Crud" except: ['show', 'create'] redirect: update grid: sylius_admin_zone diff --git a/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.en.yml b/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.en.yml index 79c217dc75..271c0171f3 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.en.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.en.yml @@ -61,6 +61,8 @@ sylius: account_verification_required_details: By disabling this option, it will be possible to create accounts and access them without email verification and thus potentially access order data placed as a guest. channel_pricing_history: 'Channel pricing history' channel_pricings: Channel pricings + create_new: + customer_group: 'Create a new customer group' gateway: no_sca_support_notice: The chosen payment gateway does not support SCA. pay_pal_express_checkout_deprecation_notice: > diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Create/Content/Header/TitleBlock/_title.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Create/Content/Header/TitleBlock/_title.html.twig new file mode 100644 index 0000000000..b6df8dda49 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Create/Content/Header/TitleBlock/_title.html.twig @@ -0,0 +1,10 @@ +{% import '@SyliusAdmin/Shared/Helper/header.html.twig' as _header %} + +{% set singularName = metadata.applicationName ~ '.ui.' ~ metadata.name %} +{% set header = configuration.vars.header.create|default(null) %} + +
      +
      + {{ _header.h1(header is not null ? header|trans : 'sylius.ui.new'|trans ~ ' ' ~ singularName|trans) }} +
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Create/Content/Header/_breadcrumbs.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Create/Content/Header/_breadcrumbs.html.twig new file mode 100644 index 0000000000..90485ab0cc --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Create/Content/Header/_breadcrumbs.html.twig @@ -0,0 +1,13 @@ +{% import '@SyliusAdmin/Shared/Helper/breadcrumbs.html.twig' as _breadcrumbs %} + +{% set index_url = path( + configuration.vars.index.route.name|default(configuration.getRouteName('index')), + configuration.vars.index.route.parameters|default(configuration.vars.route.parameters|default({})) +) +%} + +{{ _breadcrumbs.default([ + { name: 'Dashboard', url: path('sylius_admin_dashboard'), active: false }, + { name: metadata.applicationName~'.ui.'~metadata.pluralName, url: index_url, active: false }, + { name: 'sylius.ui.new'|trans, active: true} +]) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Create/Content/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Create/Content/_form.html.twig new file mode 100644 index 0000000000..347d4d716e --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Create/Content/_form.html.twig @@ -0,0 +1,36 @@ +{% form_theme form 'bootstrap_5_layout.html.twig' %} + +{% import '@SyliusAdmin/Shared/Helper/button.html.twig' as _button %} + +{% set event_name = event_prefix ~ '.form' %} +{% set resource_event_name = resource_event_prefix ~ '.form' %} +{% set index_url = path( + configuration.vars.index.route.name|default(configuration.getRouteName('index')), + configuration.vars.index.route.parameters|default(configuration.vars.route.parameters|default({})) +) +%} + +
      +
      + {% if _context.render_rest %} +
      +
      + {% endif %} + {{ form_start(form, {'action': path(configuration.vars.route.name|default(configuration.getRouteName('create')), configuration.vars.route.parameters|default({})), 'attr': {'class': 'ui loadable form', 'novalidate': 'novalidate', 'id': form.vars.id}}) }} + {{ sylius_template_event([resource_event_name, event_name], _context|merge({ event_prefix: event_name, resource_event_prefix: resource_event_name, form: form })) }} + {{ form_end(form, {'render_rest': _context.render_rest}) }} + {% if _context.render_rest %} +
      +
      +
      +
      +
      + {{ _button.cancel({ text: 'sylius.ui.cancel'|trans, url: index_url, class: 'btn btn-ghost-secondary' }) }} + {{ _button.primary({ text: 'sylius.ui.create'|trans, type: 'submit', form: form.vars.id }) }} +
      +
      +
      +
      + {% endif %} +
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/create.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/create.html.twig new file mode 100644 index 0000000000..a21d1deb3e --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/create.html.twig @@ -0,0 +1,12 @@ +{% extends '@SyliusAdmin/Shared/Layout/base.html.twig' %} + +{% set event_name = metadata.applicationName ~ '.admin.' ~ 'create.body' %} +{% set resource_event_name = metadata.applicationName ~ '.admin.' ~ metadata.name ~ '.create.body' %} + +{% set header = configuration.vars.header|default(metadata.applicationName~'.ui.'~metadata.pluralName) %} + +{% block title %}{{ header|trans }} | {{ parent() }}{% endblock %} + +{% block body %} + {{ sylius_template_event([resource_event_name, event_name], { event_prefix: event_name, resource_event_prefix: resource_event_name, resource: resource, metadata: metadata, configuration: configuration, form: form }) }} +{% endblock %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/button.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/button.html.twig index ed7efd5639..dc064fc0be 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/button.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/button.html.twig @@ -13,6 +13,7 @@ size: null, type: "button", url: null, + form: null, }|merge(params) %} {% set buttonClass = 'btn' ~ @@ -36,6 +37,7 @@ {% else %}
      {% if event.names|length > 1 %}{% endif %} - + + @@ -88,7 +89,8 @@ {% if event.names|length > 1 %}{% endif %} - + + From 77af62ec7dc652881bfd5e4ae52f1072c08b635c Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Mon, 2 Oct 2023 10:05:46 +0200 Subject: [PATCH 033/166] Refactor Template Events to use a standalone ComponentBlock with a bc manner --- composer.json | 2 +- psalm.xml | 3 +- .../Command/DebugTemplateEventCommand.php | 9 +- .../CompositeContextProvider.php | 55 +++++++++ .../ContextProviderInterface.php | 6 +- .../DefaultContextProvider.php | 6 +- .../Exception/NoSupportedContextProvider.php | 18 +++ ...gHistory.php => BlockRenderingHistory.php} | 31 +++-- .../TemplateBlockDataCollector.php | 2 +- ...enderer.php => TraceableBlockRenderer.php} | 12 +- ...rer.php => TraceableTwigEventRenderer.php} | 8 +- .../DependencyInjection/Configuration.php | 23 +++- .../DependencyInjection/SyliusUiExtension.php | 58 ++++++++-- src/Sylius/Bundle/UiBundle/Registry/Block.php | 59 ++++++++++ .../UiBundle/Registry/BlockRegistry.php | 90 +++++++++++++++ ...terface.php => BlockRegistryInterface.php} | 14 +-- .../UiBundle/Registry/ComponentBlock.php | 73 ++++++++++++ .../UiBundle/Registry/TemplateBlock.php | 53 +++------ .../Registry/TemplateBlockRegistry.php | 93 --------------- .../Renderer/BlockRendererInterface.php | 26 +++++ .../Renderer/CompositeBlockRenderer.php | 47 ++++++++ ...er.php => DelegatingTwigEventRenderer.php} | 10 +- .../Exception/NoSupportedBlockRenderer.php | 18 +++ .../Renderer/HtmlDebugBlockRenderer.php | 100 +++++++++++++++++ .../HtmlDebugTemplateBlockRenderer.php | 77 ------------- ...rer.php => HtmlDebugTwigEventRenderer.php} | 46 ++++---- ... => SupportableBlockRendererInterface.php} | 6 +- .../Renderer/TwigComponentBlockRenderer.php | 58 ++++++++-- ...ace.php => TwigEventRendererInterface.php} | 7 +- .../Renderer/TwigTemplateBlockRenderer.php | 24 +++- .../config/services/debug/template_event.xml | 31 ++--- .../config/services/template_event.xml | 22 +++- .../DependencyInjection/ConfigurationTest.php | 102 +++++++++++++++++ .../SyliusUiExtensionTest.php | 23 ++-- .../Functional/src/CustomContextProvider.php | 6 +- .../UiBundle/Twig/TemplateEventExtension.php | 4 +- .../CompositeContextProviderSpec.php | 77 +++++++++++++ ...RegistrySpec.php => BlockRegistrySpec.php} | 31 ++--- .../spec/Registry/ComponentBlockSpec.php | 100 +++++++++++++++++ .../spec/Registry/TemplateBlockSpec.php | 44 +++++--- .../Renderer/CompositeBlockRendererSpec.php | 74 ++++++++++++ ...hp => DelegatingTwigEventRendererSpec.php} | 24 ++-- .../Renderer/HtmlDebugBlockRendererSpec.php | 70 ++++++++++++ .../HtmlDebugTemplateBlockRendererSpec.php | 69 ------------ ...php => HtmlDebugTwigEventRendererSpec.php} | 37 +++--- .../TwigComponentBlockRendererSpec.php | 106 ++++++++++++------ .../TwigTemplateBlockRendererSpec.php | 15 ++- 47 files changed, 1375 insertions(+), 494 deletions(-) create mode 100644 src/Sylius/Bundle/UiBundle/ContextProvider/CompositeContextProvider.php create mode 100644 src/Sylius/Bundle/UiBundle/ContextProvider/Exception/NoSupportedContextProvider.php rename src/Sylius/Bundle/UiBundle/DataCollector/{TemplateBlockRenderingHistory.php => BlockRenderingHistory.php} (65%) rename src/Sylius/Bundle/UiBundle/DataCollector/{TraceableTemplateBlockRenderer.php => TraceableBlockRenderer.php} (60%) rename src/Sylius/Bundle/UiBundle/DataCollector/{TraceableTemplateEventRenderer.php => TraceableTwigEventRenderer.php} (71%) create mode 100644 src/Sylius/Bundle/UiBundle/Registry/Block.php create mode 100644 src/Sylius/Bundle/UiBundle/Registry/BlockRegistry.php rename src/Sylius/Bundle/UiBundle/Registry/{TemplateBlockRegistryInterface.php => BlockRegistryInterface.php} (62%) create mode 100644 src/Sylius/Bundle/UiBundle/Registry/ComponentBlock.php delete mode 100644 src/Sylius/Bundle/UiBundle/Registry/TemplateBlockRegistry.php create mode 100644 src/Sylius/Bundle/UiBundle/Renderer/BlockRendererInterface.php create mode 100644 src/Sylius/Bundle/UiBundle/Renderer/CompositeBlockRenderer.php rename src/Sylius/Bundle/UiBundle/Renderer/{DelegatingTemplateEventRenderer.php => DelegatingTwigEventRenderer.php} (65%) create mode 100644 src/Sylius/Bundle/UiBundle/Renderer/Exception/NoSupportedBlockRenderer.php create mode 100644 src/Sylius/Bundle/UiBundle/Renderer/HtmlDebugBlockRenderer.php delete mode 100644 src/Sylius/Bundle/UiBundle/Renderer/HtmlDebugTemplateBlockRenderer.php rename src/Sylius/Bundle/UiBundle/Renderer/{HtmlDebugTemplateEventRenderer.php => HtmlDebugTwigEventRenderer.php} (50%) rename src/Sylius/Bundle/UiBundle/Renderer/{TemplateBlockRendererInterface.php => SupportableBlockRendererInterface.php} (61%) rename src/Sylius/Bundle/UiBundle/Renderer/{TemplateEventRendererInterface.php => TwigEventRendererInterface.php} (67%) create mode 100644 src/Sylius/Bundle/UiBundle/spec/ContextProvider/CompositeContextProviderSpec.php rename src/Sylius/Bundle/UiBundle/spec/Registry/{TemplateBlockRegistrySpec.php => BlockRegistrySpec.php} (80%) create mode 100644 src/Sylius/Bundle/UiBundle/spec/Registry/ComponentBlockSpec.php create mode 100644 src/Sylius/Bundle/UiBundle/spec/Renderer/CompositeBlockRendererSpec.php rename src/Sylius/Bundle/UiBundle/spec/Renderer/{DelegatingTemplateEventRendererSpec.php => DelegatingTwigEventRendererSpec.php} (65%) create mode 100644 src/Sylius/Bundle/UiBundle/spec/Renderer/HtmlDebugBlockRendererSpec.php delete mode 100644 src/Sylius/Bundle/UiBundle/spec/Renderer/HtmlDebugTemplateBlockRendererSpec.php rename src/Sylius/Bundle/UiBundle/spec/Renderer/{HtmlDebugTemplateEventRendererSpec.php => HtmlDebugTwigEventRendererSpec.php} (65%) diff --git a/composer.json b/composer.json index 85eb1d9329..f53656b53e 100644 --- a/composer.json +++ b/composer.json @@ -233,7 +233,7 @@ "symfony/runtime": "^6.3.2", "symfony/web-profiler-bundle": "^6.3.2", "symplify/monorepo-builder": "^11.0", - "vimeo/psalm": "5.15.*", + "vimeo/psalm": "5.14.*", "weirdan/doctrine-psalm-plugin": "^2.8" }, "suggest": { diff --git a/psalm.xml b/psalm.xml index 930e561dd5..ac67aed403 100644 --- a/psalm.xml +++ b/psalm.xml @@ -66,6 +66,7 @@ + @@ -135,7 +136,7 @@ - + diff --git a/src/Sylius/Bundle/UiBundle/Command/DebugTemplateEventCommand.php b/src/Sylius/Bundle/UiBundle/Command/DebugTemplateEventCommand.php index 695319cdad..29b64ed731 100644 --- a/src/Sylius/Bundle/UiBundle/Command/DebugTemplateEventCommand.php +++ b/src/Sylius/Bundle/UiBundle/Command/DebugTemplateEventCommand.php @@ -13,8 +13,8 @@ declare(strict_types=1); namespace Sylius\Bundle\UiBundle\Command; +use Sylius\Bundle\UiBundle\Registry\BlockRegistryInterface; use Sylius\Bundle\UiBundle\Registry\TemplateBlock; -use Sylius\Bundle\UiBundle\Registry\TemplateBlockRegistryInterface; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; @@ -25,7 +25,7 @@ final class DebugTemplateEventCommand extends Command { protected static $defaultName = 'sylius:debug:template-event'; - public function __construct(private TemplateBlockRegistryInterface $templateBlockRegistry) + public function __construct(private BlockRegistryInterface $templateBlockRegistry) { parent::__construct(); } @@ -53,6 +53,9 @@ final class DebugTemplateEventCommand extends Command $io->title(sprintf('Blocks registered for the template event "%s"', $eventName)); + /** @var array $templateBlocksForEvent */ + $templateBlocksForEvent = $this->templateBlockRegistry->all()[$eventName] ?? []; + $io->table( ['Block name', 'Template', 'Priority', 'Enabled'], array_map( @@ -62,7 +65,7 @@ final class DebugTemplateEventCommand extends Command $templateBlock->getPriority(), $templateBlock->isEnabled() ? 'TRUE' : 'FALSE', ], - $this->templateBlockRegistry->all()[$eventName] ?? [], + $templateBlocksForEvent, ), ); diff --git a/src/Sylius/Bundle/UiBundle/ContextProvider/CompositeContextProvider.php b/src/Sylius/Bundle/UiBundle/ContextProvider/CompositeContextProvider.php new file mode 100644 index 0000000000..80b69d5b9a --- /dev/null +++ b/src/Sylius/Bundle/UiBundle/ContextProvider/CompositeContextProvider.php @@ -0,0 +1,55 @@ + */ + private array $contextProviders; + + /** + * @param iterable $contextProviders + */ + public function __construct(iterable $contextProviders) + { + Assert::allIsInstanceOf($contextProviders, ContextProviderInterface::class); + $this->contextProviders = $contextProviders instanceof \Traversable ? iterator_to_array($contextProviders) : $contextProviders; + } + + /** + * @param array $templateContext + * @return array + */ + public function provide(array $templateContext, Block $templateBlock): array + { + foreach ($this->contextProviders as $contextProvider) { + if (!$contextProvider->supports($templateBlock)) { + continue; + } + + return $contextProvider->provide($templateContext, $templateBlock); + } + + throw new NoSupportedContextProvider(sprintf('No supported context provider found for block "%s".', $templateBlock->getName())); + } + + public function supports(Block $templateBlock): bool + { + return true; + } +} diff --git a/src/Sylius/Bundle/UiBundle/ContextProvider/ContextProviderInterface.php b/src/Sylius/Bundle/UiBundle/ContextProvider/ContextProviderInterface.php index 8949a78cc5..0963868072 100644 --- a/src/Sylius/Bundle/UiBundle/ContextProvider/ContextProviderInterface.php +++ b/src/Sylius/Bundle/UiBundle/ContextProvider/ContextProviderInterface.php @@ -13,11 +13,11 @@ declare(strict_types=1); namespace Sylius\Bundle\UiBundle\ContextProvider; -use Sylius\Bundle\UiBundle\Registry\TemplateBlock; +use Sylius\Bundle\UiBundle\Registry\Block; interface ContextProviderInterface { - public function provide(array $templateContext, TemplateBlock $templateBlock): array; + public function provide(array $templateContext, Block $templateBlock): array; - public function supports(TemplateBlock $templateBlock): bool; + public function supports(Block $templateBlock): bool; } diff --git a/src/Sylius/Bundle/UiBundle/ContextProvider/DefaultContextProvider.php b/src/Sylius/Bundle/UiBundle/ContextProvider/DefaultContextProvider.php index e18a3fe85f..add91fc431 100644 --- a/src/Sylius/Bundle/UiBundle/ContextProvider/DefaultContextProvider.php +++ b/src/Sylius/Bundle/UiBundle/ContextProvider/DefaultContextProvider.php @@ -13,16 +13,16 @@ declare(strict_types=1); namespace Sylius\Bundle\UiBundle\ContextProvider; -use Sylius\Bundle\UiBundle\Registry\TemplateBlock; +use Sylius\Bundle\UiBundle\Registry\Block; final class DefaultContextProvider implements ContextProviderInterface { - public function provide(array $templateContext, TemplateBlock $templateBlock): array + public function provide(array $templateContext, Block $templateBlock): array { return array_replace($templateBlock->getContext(), $templateContext); } - public function supports(TemplateBlock $templateBlock): bool + public function supports(Block $templateBlock): bool { return true; } diff --git a/src/Sylius/Bundle/UiBundle/ContextProvider/Exception/NoSupportedContextProvider.php b/src/Sylius/Bundle/UiBundle/ContextProvider/Exception/NoSupportedContextProvider.php new file mode 100644 index 0000000000..b2d9535d85 --- /dev/null +++ b/src/Sylius/Bundle/UiBundle/ContextProvider/Exception/NoSupportedContextProvider.php @@ -0,0 +1,18 @@ +}> */ + /** @psalm-var list}> */ private $renderedEvents = []; - /** @psalm-var list}> */ + /** @psalm-var list}> */ private array $currentlyRenderedEvents = []; - /** @psalm-var list */ + /** @psalm-var list */ private array $currentlyRenderedBlocks = []; + /** + * @param array $eventNames + * @param array $context + */ public function startRenderingEvent(array $eventNames, array $context): void { $this->currentlyRenderedEvents[] = ['names' => $eventNames, 'start' => microtime(true), 'blocks' => []]; } - public function startRenderingBlock(TemplateBlock $templateBlock, array $context): void + /** + * @param array $context + */ + public function startRenderingBlock(Block $templateBlock, array $context): void { $this->currentlyRenderedBlocks[] = ['definition' => $templateBlock, 'start' => microtime(true)]; } - public function stopRenderingBlock(TemplateBlock $templateBlock, array $context): void + /** + * @param array $context + */ + public function stopRenderingBlock(Block $templateBlock, array $context): void { $currentlyRenderedBlock = array_pop($this->currentlyRenderedBlocks); $currentlyRenderedBlock['stop'] = microtime(true); @@ -48,6 +58,10 @@ final class TemplateBlockRenderingHistory $this->currentlyRenderedEvents[] = $currentlyRenderedEvent; } + /** + * @param array $eventNames + * @param array $context + */ public function stopRenderingEvent(array $eventNames, array $context): void { $currentlyRenderedEvent = array_pop($this->currentlyRenderedEvents); @@ -56,6 +70,9 @@ final class TemplateBlockRenderingHistory $this->renderedEvents[] = $currentlyRenderedEvent; } + /** + * @return array}> + */ public function getRenderedEvents(): array { return $this->renderedEvents; diff --git a/src/Sylius/Bundle/UiBundle/DataCollector/TemplateBlockDataCollector.php b/src/Sylius/Bundle/UiBundle/DataCollector/TemplateBlockDataCollector.php index b956bb74fb..037984a079 100644 --- a/src/Sylius/Bundle/UiBundle/DataCollector/TemplateBlockDataCollector.php +++ b/src/Sylius/Bundle/UiBundle/DataCollector/TemplateBlockDataCollector.php @@ -20,7 +20,7 @@ use Symfony\Component\HttpKernel\DataCollector\DataCollector; /** @internal */ final class TemplateBlockDataCollector extends DataCollector { - public function __construct(private TemplateBlockRenderingHistory $templateBlockRenderingHistory) + public function __construct(private BlockRenderingHistory $templateBlockRenderingHistory) { $this->reset(); } diff --git a/src/Sylius/Bundle/UiBundle/DataCollector/TraceableTemplateBlockRenderer.php b/src/Sylius/Bundle/UiBundle/DataCollector/TraceableBlockRenderer.php similarity index 60% rename from src/Sylius/Bundle/UiBundle/DataCollector/TraceableTemplateBlockRenderer.php rename to src/Sylius/Bundle/UiBundle/DataCollector/TraceableBlockRenderer.php index b6bd1cbb02..c34670870d 100644 --- a/src/Sylius/Bundle/UiBundle/DataCollector/TraceableTemplateBlockRenderer.php +++ b/src/Sylius/Bundle/UiBundle/DataCollector/TraceableBlockRenderer.php @@ -13,19 +13,19 @@ declare(strict_types=1); namespace Sylius\Bundle\UiBundle\DataCollector; -use Sylius\Bundle\UiBundle\Registry\TemplateBlock; -use Sylius\Bundle\UiBundle\Renderer\TemplateBlockRendererInterface; +use Sylius\Bundle\UiBundle\Registry\Block; +use Sylius\Bundle\UiBundle\Renderer\BlockRendererInterface; /** @internal */ -final class TraceableTemplateBlockRenderer implements TemplateBlockRendererInterface +final class TraceableBlockRenderer implements BlockRendererInterface { public function __construct( - private TemplateBlockRendererInterface $templateBlockRenderer, - private TemplateBlockRenderingHistory $templateBlockRenderingHistory, + private BlockRendererInterface $templateBlockRenderer, + private BlockRenderingHistory $templateBlockRenderingHistory, ) { } - public function render(TemplateBlock $templateBlock, array $context = []): string + public function render(Block $templateBlock, array $context = []): string { $this->templateBlockRenderingHistory->startRenderingBlock($templateBlock, $context); diff --git a/src/Sylius/Bundle/UiBundle/DataCollector/TraceableTemplateEventRenderer.php b/src/Sylius/Bundle/UiBundle/DataCollector/TraceableTwigEventRenderer.php similarity index 71% rename from src/Sylius/Bundle/UiBundle/DataCollector/TraceableTemplateEventRenderer.php rename to src/Sylius/Bundle/UiBundle/DataCollector/TraceableTwigEventRenderer.php index 25296ebee9..02de703a33 100644 --- a/src/Sylius/Bundle/UiBundle/DataCollector/TraceableTemplateEventRenderer.php +++ b/src/Sylius/Bundle/UiBundle/DataCollector/TraceableTwigEventRenderer.php @@ -13,14 +13,14 @@ declare(strict_types=1); namespace Sylius\Bundle\UiBundle\DataCollector; -use Sylius\Bundle\UiBundle\Renderer\TemplateEventRendererInterface; +use Sylius\Bundle\UiBundle\Renderer\TwigEventRendererInterface; /** @internal */ -final class TraceableTemplateEventRenderer implements TemplateEventRendererInterface +final class TraceableTwigEventRenderer implements TwigEventRendererInterface { public function __construct( - private TemplateEventRendererInterface $templateEventRenderer, - private TemplateBlockRenderingHistory $templateBlockRenderingHistory, + private TwigEventRendererInterface $templateEventRenderer, + private BlockRenderingHistory $templateBlockRenderingHistory, ) { } diff --git a/src/Sylius/Bundle/UiBundle/DependencyInjection/Configuration.php b/src/Sylius/Bundle/UiBundle/DependencyInjection/Configuration.php index c6ff67ec55..d86665ec50 100644 --- a/src/Sylius/Bundle/UiBundle/DependencyInjection/Configuration.php +++ b/src/Sylius/Bundle/UiBundle/DependencyInjection/Configuration.php @@ -42,11 +42,32 @@ final class Configuration implements ConfigurationInterface ->ifString() ->then(static fn (?string $template): array => ['template' => $template]) ->end() + ->validate() + ->ifTrue(static function (array $block): bool { + if (!array_key_exists('template', $block) || !array_key_exists('component', $block)) { + return false; + } + + return null !== $block['template'] && [] !== $block['component']; + }) + ->thenInvalid('You cannot use both "template" and "component" for a block.') + ->end() ->children() ->booleanNode('enabled')->defaultNull()->end() ->arrayNode('context')->addDefaultsIfNotSet()->ignoreExtraKeys(false)->end() ->scalarNode('template')->defaultNull()->end() - ->scalarNode('component')->defaultNull()->end() + ->arrayNode('component') + ->beforeNormalization() + ->ifString() + ->then(static fn (?string $component): array => ['name' => $component]) + ->end() + ->treatNullLike([]) + ->addDefaultsIfNotSet() + ->children() + ->scalarNode('name')->isRequired()->end() + ->arrayNode('inputs')->ignoreExtraKeys(false)->end() + ->end() + ->end() ->integerNode('priority')->defaultNull()->end() ; diff --git a/src/Sylius/Bundle/UiBundle/DependencyInjection/SyliusUiExtension.php b/src/Sylius/Bundle/UiBundle/DependencyInjection/SyliusUiExtension.php index 56c81ed1ce..e0d2219cd1 100644 --- a/src/Sylius/Bundle/UiBundle/DependencyInjection/SyliusUiExtension.php +++ b/src/Sylius/Bundle/UiBundle/DependencyInjection/SyliusUiExtension.php @@ -14,8 +14,9 @@ declare(strict_types=1); namespace Sylius\Bundle\UiBundle\DependencyInjection; use Laminas\Stdlib\SplPriorityQueue; +use Sylius\Bundle\UiBundle\Registry\BlockRegistryInterface; +use Sylius\Bundle\UiBundle\Registry\ComponentBlock; use Sylius\Bundle\UiBundle\Registry\TemplateBlock; -use Sylius\Bundle\UiBundle\Registry\TemplateBlockRegistryInterface; use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Definition; @@ -44,7 +45,7 @@ final class SyliusUiExtension extends Extension */ private function loadEvents(array $eventsConfig, ContainerBuilder $container): void { - $templateBlockRegistryDefinition = $container->findDefinition(TemplateBlockRegistryInterface::class); + $templateBlockRegistryDefinition = $container->findDefinition(BlockRegistryInterface::class); $blocksForEvents = []; foreach ($eventsConfig as $eventName => $eventConfiguration) { @@ -57,20 +58,53 @@ final class SyliusUiExtension extends Extension $blocksPriorityQueue->insert($details, $details['priority'] ?? 0); } - /** @psalm-var array{name: string, eventName: string, template: string, component: string|null, context: array, priority: int, enabled: bool} $details */ + /** @psalm-var array{name: string, eventName: string, template: string, component: array{name?: string, inputs?: array}, context: array, priority: int, enabled: bool} $details */ foreach ($blocksPriorityQueue->toArray() as $details) { - $blocksForEvents[$eventName][$details['name']] = new Definition(TemplateBlock::class, [ - $details['name'], - $details['eventName'], - $details['template'], - $details['context'], - $details['priority'], - $details['enabled'], - $details['component'], - ]); + $blockType = [] !== $details['component'] ? 'component' : 'template'; + $blocksForEvents[$eventName][$details['name']] = match ($blockType) { + 'template' => $this->createTemplateBlockDefinition($details), + 'component' => $this->createComponentBlockDefinition($details), + }; } } $templateBlockRegistryDefinition->setArgument(0, $blocksForEvents); } + + /** + * @param array $details + */ + private function createTemplateBlockDefinition(array $details): Definition + { + return new Definition( + TemplateBlock::class, + [ + $details['name'], + $details['eventName'], + $details['template'], + $details['context'], + $details['priority'], + $details['enabled'], + ], + ); + } + + /** + * @param array $details + */ + private function createComponentBlockDefinition(array $details): Definition + { + return new Definition( + ComponentBlock::class, + [ + $details['name'], + $details['eventName'], + $details['component']['name'], + $details['component']['inputs'] ?? [], + $details['context'], + $details['priority'], + $details['enabled'], + ], + ); + } } diff --git a/src/Sylius/Bundle/UiBundle/Registry/Block.php b/src/Sylius/Bundle/UiBundle/Registry/Block.php new file mode 100644 index 0000000000..4e9ce062c7 --- /dev/null +++ b/src/Sylius/Bundle/UiBundle/Registry/Block.php @@ -0,0 +1,59 @@ +|null $context + */ + public function __construct( + protected string $name, + protected string $eventName, + protected ?array $context, + protected ?int $priority, + protected ?bool $enabled, + ) { + } + + public function getName(): string + { + return $this->name; + } + + public function getEventName(): string + { + return $this->eventName; + } + + /** + * @return array + */ + public function getContext(): array + { + return $this->context ?? []; + } + + public function getPriority(): int + { + return $this->priority ?? 0; + } + + public function isEnabled(): bool + { + return $this->enabled ?? true; + } + + abstract public function overwriteWith(self $block): self; +} diff --git a/src/Sylius/Bundle/UiBundle/Registry/BlockRegistry.php b/src/Sylius/Bundle/UiBundle/Registry/BlockRegistry.php new file mode 100644 index 0000000000..06239134d1 --- /dev/null +++ b/src/Sylius/Bundle/UiBundle/Registry/BlockRegistry.php @@ -0,0 +1,90 @@ +> + */ + private array $eventsToBlocks; + + /** + * @param array> $eventsToTemplateBlocks + */ + public function __construct(array $eventsToTemplateBlocks) + { + $this->eventsToBlocks = $eventsToTemplateBlocks; + } + + public function all(): array + { + return $this->eventsToBlocks; + } + + public function findEnabledForEvents(array $eventNames): array + { + // No need to sort blocks again if there's only one event because we have them sorted already + if (count($eventNames) === 1) { + $eventName = reset($eventNames); + + return array_values(array_filter( + $this->eventsToBlocks[$eventName] ?? [], + static fn (Block $block): bool => $block->isEnabled(), + )); + } + + $enabledFinalizedBlocks = array_filter( + $this->findFinalizedForEvents($eventNames), + static fn (Block $block): bool => $block->isEnabled(), + ); + + $blocksPriorityQueue = new SplPriorityQueue(); + foreach ($enabledFinalizedBlocks as $block) { + $blocksPriorityQueue->insert($block, $block->getPriority()); + } + + return $blocksPriorityQueue->toArray(); + } + + /** + * @param string[] $eventNames + * + * @return Block[] + */ + private function findFinalizedForEvents(array $eventNames): array + { + /** @var array $finalizedBlocks */ + $finalizedBlocks = []; + $reversedEventNames = array_reverse($eventNames); + foreach ($reversedEventNames as $eventName) { + $blocks = $this->eventsToBlocks[$eventName] ?? []; + foreach ($blocks as $blockName => $block) { + if (array_key_exists($blockName, $finalizedBlocks)) { + $block = $finalizedBlocks[$blockName]->overwriteWith($block); + } + + $finalizedBlocks[$blockName] = $block; + } + } + + return $finalizedBlocks; + } +} + +class_alias(BlockRegistry::class, '\Sylius\Bundle\UiBundle\Registry\TemplateBlockRegistry'); diff --git a/src/Sylius/Bundle/UiBundle/Registry/TemplateBlockRegistryInterface.php b/src/Sylius/Bundle/UiBundle/Registry/BlockRegistryInterface.php similarity index 62% rename from src/Sylius/Bundle/UiBundle/Registry/TemplateBlockRegistryInterface.php rename to src/Sylius/Bundle/UiBundle/Registry/BlockRegistryInterface.php index c6335ca410..a69c409066 100644 --- a/src/Sylius/Bundle/UiBundle/Registry/TemplateBlockRegistryInterface.php +++ b/src/Sylius/Bundle/UiBundle/Registry/BlockRegistryInterface.php @@ -13,23 +13,19 @@ declare(strict_types=1); namespace Sylius\Bundle\UiBundle\Registry; -interface TemplateBlockRegistryInterface +interface BlockRegistryInterface { /** - * @return TemplateBlock[][] - * - * @psalm-return array> + * @return array> */ public function all(): array; /** * @param string[] $eventNames * - * @psalm-param non-empty-list $eventNames - * - * @return TemplateBlock[] - * - * @psalm-return list + * @return Block[] */ public function findEnabledForEvents(array $eventNames): array; } + +class_alias(BlockRegistryInterface::class, '\Sylius\Bundle\UiBundle\Registry\TemplateBlockRegistryInterface'); diff --git a/src/Sylius/Bundle/UiBundle/Registry/ComponentBlock.php b/src/Sylius/Bundle/UiBundle/Registry/ComponentBlock.php new file mode 100644 index 0000000000..95a9070da4 --- /dev/null +++ b/src/Sylius/Bundle/UiBundle/Registry/ComponentBlock.php @@ -0,0 +1,73 @@ + $componentInputs + * @param array|null $context + */ + public function __construct( + string $name, + string $eventName, + private string $componentName, + private array $componentInputs, + ?array $context, + ?int $priority, + ?bool $enabled, + ) { + parent::__construct($name, $eventName, $context, $priority, $enabled); + } + + public function getComponentName(): string + { + return $this->componentName; + } + + /** @return array */ + public function getComponentInputs(): array + { + return $this->componentInputs; + } + + public function overwriteWith(Block $block): self + { + if (!$block instanceof ComponentBlock) { + throw new \DomainException(sprintf( + 'Trying to overwrite component block "%s" with block of different type "%s".', + $this->name, + get_class($block), + )); + } + + if ($this->name !== $block->name) { + throw new \DomainException(sprintf( + 'Trying to overwrite block "%s" with block "%s".', + $this->name, + $block->name, + )); + } + + return new self( + $this->name, + $block->eventName, + $block->getComponentName(), + $block->getComponentInputs(), + $block->context ?? $this->context, + $block->priority ?? $this->priority, + $block->enabled ?? $this->enabled, + ); + } +} diff --git a/src/Sylius/Bundle/UiBundle/Registry/TemplateBlock.php b/src/Sylius/Bundle/UiBundle/Registry/TemplateBlock.php index 96c82cdf03..ca07f7b42d 100644 --- a/src/Sylius/Bundle/UiBundle/Registry/TemplateBlock.php +++ b/src/Sylius/Bundle/UiBundle/Registry/TemplateBlock.php @@ -13,27 +13,17 @@ declare(strict_types=1); namespace Sylius\Bundle\UiBundle\Registry; -final class TemplateBlock +final class TemplateBlock extends Block { public function __construct( - private string $name, - private string $eventName, + string $name, + string $eventName, private ?string $template, - private ?array $context, - private ?int $priority, - private ?bool $enabled, - private ?string $component = null, + ?array $context, + ?int $priority, + ?bool $enabled, ) { - } - - public function getName(): string - { - return $this->name; - } - - public function getEventName(): string - { - return $this->eventName; + parent::__construct($name, $eventName, $context, $priority, $enabled); } public function getTemplate(): string @@ -49,28 +39,16 @@ final class TemplateBlock return $this->template; } - public function getComponent(): ?string + public function overwriteWith(Block $block): self { - return $this->component; - } + if (!$block instanceof self) { + throw new \DomainException(sprintf( + 'Trying to overwrite template block "%s" with block of different type "%s".', + $this->name, + get_class($block), + )); + } - public function getContext(): array - { - return $this->context ?? []; - } - - public function getPriority(): int - { - return $this->priority ?? 0; - } - - public function isEnabled(): bool - { - return $this->enabled ?? true; - } - - public function overwriteWith(self $block): self - { if ($this->name !== $block->name) { throw new \DomainException(sprintf( 'Trying to overwrite block "%s" with block "%s".', @@ -86,7 +64,6 @@ final class TemplateBlock $block->context ?? $this->context, $block->priority ?? $this->priority, $block->enabled ?? $this->enabled, - $block->component ?? $this->component, ); } } diff --git a/src/Sylius/Bundle/UiBundle/Registry/TemplateBlockRegistry.php b/src/Sylius/Bundle/UiBundle/Registry/TemplateBlockRegistry.php deleted file mode 100644 index 6b8dd17693..0000000000 --- a/src/Sylius/Bundle/UiBundle/Registry/TemplateBlockRegistry.php +++ /dev/null @@ -1,93 +0,0 @@ -> - */ - private $eventsToTemplateBlocks; - - public function __construct(array $eventsToTemplateBlocks) - { - $this->eventsToTemplateBlocks = $eventsToTemplateBlocks; - } - - public function all(): array - { - return $this->eventsToTemplateBlocks; - } - - public function findEnabledForEvents(array $eventNames): array - { - // No need to sort blocks again if there's only one event because we have them sorted already - if (count($eventNames) === 1) { - $eventName = reset($eventNames); - - return array_values(array_filter( - $this->eventsToTemplateBlocks[$eventName] ?? [], - static fn (TemplateBlock $templateBlock): bool => $templateBlock->isEnabled(), - )); - } - - $enabledFinalizedTemplateBlocks = array_filter( - $this->findFinalizedForEvents($eventNames), - static fn (TemplateBlock $templateBlock): bool => $templateBlock->isEnabled(), - ); - - $templateBlocksPriorityQueue = new SplPriorityQueue(); - foreach ($enabledFinalizedTemplateBlocks as $templateBlock) { - $templateBlocksPriorityQueue->insert($templateBlock, $templateBlock->getPriority()); - } - - return $templateBlocksPriorityQueue->toArray(); - } - - /** - * @param string[] $eventNames - * - * @psalm-param non-empty-list $eventNames - * - * @return TemplateBlock[] - */ - private function findFinalizedForEvents(array $eventNames): array - { - /** - * @var TemplateBlock[] $finalizedTemplateBlocks - * - * @psalm-var array $finalizedTemplateBlocks - */ - $finalizedTemplateBlocks = []; - $reversedEventNames = array_reverse($eventNames); - foreach ($reversedEventNames as $eventName) { - $templateBlocks = $this->eventsToTemplateBlocks[$eventName] ?? []; - foreach ($templateBlocks as $blockName => $templateBlock) { - if (array_key_exists($blockName, $finalizedTemplateBlocks)) { - $templateBlock = $finalizedTemplateBlocks[$blockName]->overwriteWith($templateBlock); - } - - $finalizedTemplateBlocks[$blockName] = $templateBlock; - } - } - - return $finalizedTemplateBlocks; - } -} diff --git a/src/Sylius/Bundle/UiBundle/Renderer/BlockRendererInterface.php b/src/Sylius/Bundle/UiBundle/Renderer/BlockRendererInterface.php new file mode 100644 index 0000000000..968f537be1 --- /dev/null +++ b/src/Sylius/Bundle/UiBundle/Renderer/BlockRendererInterface.php @@ -0,0 +1,26 @@ + $context + */ + public function render(Block $templateBlock, array $context = []): string; +} + +class_alias(BlockRendererInterface::class, '\Sylius\Bundle\UiBundle\Renderer\TemplateBlockRendererInterface'); diff --git a/src/Sylius/Bundle/UiBundle/Renderer/CompositeBlockRenderer.php b/src/Sylius/Bundle/UiBundle/Renderer/CompositeBlockRenderer.php new file mode 100644 index 0000000000..19053362ea --- /dev/null +++ b/src/Sylius/Bundle/UiBundle/Renderer/CompositeBlockRenderer.php @@ -0,0 +1,47 @@ + */ + private array $blockRenderers; + + /** + * @param iterable $blockRenderers + */ + public function __construct(iterable $blockRenderers) + { + Assert::allIsInstanceOf($blockRenderers, SupportableBlockRendererInterface::class); + $this->blockRenderers = $blockRenderers instanceof \Traversable ? iterator_to_array($blockRenderers) : $blockRenderers; + } + + public function render(Block $templateBlock, array $context = []): string + { + foreach ($this->blockRenderers as $blockRenderer) { + if (!$blockRenderer->supports($templateBlock)) { + continue; + } + + return $blockRenderer->render($templateBlock, $context); + } + + throw new NoSupportedBlockRenderer(sprintf('No supported block renderer found for "%s" block.', $templateBlock->getName())); + } +} diff --git a/src/Sylius/Bundle/UiBundle/Renderer/DelegatingTemplateEventRenderer.php b/src/Sylius/Bundle/UiBundle/Renderer/DelegatingTwigEventRenderer.php similarity index 65% rename from src/Sylius/Bundle/UiBundle/Renderer/DelegatingTemplateEventRenderer.php rename to src/Sylius/Bundle/UiBundle/Renderer/DelegatingTwigEventRenderer.php index 91bac0dfd7..a8e1becefe 100644 --- a/src/Sylius/Bundle/UiBundle/Renderer/DelegatingTemplateEventRenderer.php +++ b/src/Sylius/Bundle/UiBundle/Renderer/DelegatingTwigEventRenderer.php @@ -13,14 +13,18 @@ declare(strict_types=1); namespace Sylius\Bundle\UiBundle\Renderer; -use Sylius\Bundle\UiBundle\Registry\TemplateBlockRegistryInterface; +use Sylius\Bundle\UiBundle\Registry\BlockRegistryInterface; -final class DelegatingTemplateEventRenderer implements TemplateEventRendererInterface +final class DelegatingTwigEventRenderer implements TwigEventRendererInterface { - public function __construct(private TemplateBlockRegistryInterface $templateBlockRegistry, private TemplateBlockRendererInterface $templateBlockRenderer) + public function __construct(private BlockRegistryInterface $templateBlockRegistry, private BlockRendererInterface $templateBlockRenderer) { } + /** + * @param array $eventNames + * @param array $context + */ public function render(array $eventNames, array $context = []): string { $templateBlocks = $this->templateBlockRegistry->findEnabledForEvents($eventNames); diff --git a/src/Sylius/Bundle/UiBundle/Renderer/Exception/NoSupportedBlockRenderer.php b/src/Sylius/Bundle/UiBundle/Renderer/Exception/NoSupportedBlockRenderer.php new file mode 100644 index 0000000000..35f02a224c --- /dev/null +++ b/src/Sylius/Bundle/UiBundle/Renderer/Exception/NoSupportedBlockRenderer.php @@ -0,0 +1,18 @@ +shouldRenderHtmlDebug($templateBlock)) { + return $this->blockRenderer->render($templateBlock, $context); + } + + $renderedParts = []; + + switch (get_class($templateBlock)) { + case TemplateBlock::class: + $renderedParts[] = $this->getBeginBlockForTemplate($templateBlock); + + break; + case ComponentBlock::class: + $renderedParts[] = $this->getBeginBlockForComponent($templateBlock); + + break; + } + + $renderedParts[] = $this->blockRenderer->render($templateBlock, $context); + $renderedParts[] = $this->getEndBlock($templateBlock); + + return implode("\n", $renderedParts); + } + + private function shouldRenderHtmlDebug(Block $block): bool + { + return match (get_class($block)) { + TemplateBlock::class => strrpos($block->getTemplate(), '.html.twig') !== false, + ComponentBlock::class => true, + default => false, + }; + } + + private function getBeginBlockForTemplate(Block $block): string + { + if (!$block instanceof TemplateBlock) { + throw new \InvalidArgumentException(sprintf('Block must be instance of "%s"', TemplateBlock::class)); + } + + return sprintf( + '', + $block->getEventName(), + $block->getName(), + $block->getTemplate(), + $block->getPriority(), + ); + } + + private function getBeginBlockForComponent(Block $block): string + { + if (!$block instanceof ComponentBlock) { + throw new \InvalidArgumentException(sprintf('Block must be instance of "%s"', ComponentBlock::class)); + } + + return sprintf( + '', + $block->getEventName(), + $block->getName(), + $block->getComponentName(), + $block->getPriority(), + ); + } + + private function getEndBlock(Block $templateBlock): string + { + return sprintf( + '', + $templateBlock->getEventName(), + $templateBlock->getName(), + ); + } +} + +class_alias(HtmlDebugBlockRenderer::class, '\Sylius\Bundle\UiBundle\Renderer\HtmlDebugTemplateBlockRenderer'); diff --git a/src/Sylius/Bundle/UiBundle/Renderer/HtmlDebugTemplateBlockRenderer.php b/src/Sylius/Bundle/UiBundle/Renderer/HtmlDebugTemplateBlockRenderer.php deleted file mode 100644 index a8fe4d34c6..0000000000 --- a/src/Sylius/Bundle/UiBundle/Renderer/HtmlDebugTemplateBlockRenderer.php +++ /dev/null @@ -1,77 +0,0 @@ -getComponent(); - $shouldRenderHtmlDebug = $isTemplateBlockComponent || strrpos($templateBlock->getTemplate(), '.html.twig') !== false; - - if (!$shouldRenderHtmlDebug) { - return $this->templateBlockRenderer->render($templateBlock, $context); - } - - $renderedParts = []; - - if ($isTemplateBlockComponent) { - $renderedParts[] = $this->getBeginBlockForComponent($templateBlock); - } else { - $renderedParts[] = $this->getBeginBlockForTemplate($templateBlock); - } - - $renderedParts[] = $this->templateBlockRenderer->render($templateBlock, $context); - $renderedParts[] = $this->getEndBlock($templateBlock); - - return implode("\n", $renderedParts); - } - - private function getBeginBlockForTemplate(TemplateBlock $templateBlock): string - { - return sprintf( - '', - $templateBlock->getEventName(), - $templateBlock->getName(), - $templateBlock->getTemplate(), - $templateBlock->getPriority(), - ); - } - - private function getBeginBlockForComponent(TemplateBlock $templateBlock): string - { - return sprintf( - '', - $templateBlock->getEventName(), - $templateBlock->getName(), - $templateBlock->getComponent(), - $templateBlock->getPriority(), - ); - } - - private function getEndBlock(TemplateBlock $templateBlock): string - { - return sprintf( - '', - $templateBlock->getEventName(), - $templateBlock->getName(), - ); - } -} diff --git a/src/Sylius/Bundle/UiBundle/Renderer/HtmlDebugTemplateEventRenderer.php b/src/Sylius/Bundle/UiBundle/Renderer/HtmlDebugTwigEventRenderer.php similarity index 50% rename from src/Sylius/Bundle/UiBundle/Renderer/HtmlDebugTemplateEventRenderer.php rename to src/Sylius/Bundle/UiBundle/Renderer/HtmlDebugTwigEventRenderer.php index 74eabf46cd..4f872a474b 100644 --- a/src/Sylius/Bundle/UiBundle/Renderer/HtmlDebugTemplateEventRenderer.php +++ b/src/Sylius/Bundle/UiBundle/Renderer/HtmlDebugTwigEventRenderer.php @@ -13,20 +13,26 @@ declare(strict_types=1); namespace Sylius\Bundle\UiBundle\Renderer; +use Sylius\Bundle\UiBundle\Registry\Block; +use Sylius\Bundle\UiBundle\Registry\BlockRegistryInterface; +use Sylius\Bundle\UiBundle\Registry\ComponentBlock; use Sylius\Bundle\UiBundle\Registry\TemplateBlock; -use Sylius\Bundle\UiBundle\Registry\TemplateBlockRegistryInterface; -final class HtmlDebugTemplateEventRenderer implements TemplateEventRendererInterface +final class HtmlDebugTwigEventRenderer implements TwigEventRendererInterface { public function __construct( - private TemplateEventRendererInterface $templateEventRenderer, - private TemplateBlockRegistryInterface $templateBlockRegistry, + private TwigEventRendererInterface $templateEventRenderer, + private BlockRegistryInterface $blockRegistry, ) { } + /** + * @param array $eventNames + * @param array $context + */ public function render(array $eventNames, array $context = []): string { - $shouldRenderHtmlDebug = $this->shouldRenderHtmlDebug($this->templateBlockRegistry->findEnabledForEvents($eventNames)); + $shouldRenderHtmlDebug = $this->shouldRenderHtmlDebug($this->blockRegistry->findEnabledForEvents($eventNames)); $renderedParts = []; @@ -50,24 +56,24 @@ final class HtmlDebugTemplateEventRenderer implements TemplateEventRendererInter } /** - * @param TemplateBlock[] $templateBlocks + * @param Block[] $blocks */ - private function shouldRenderHtmlDebug(array $templateBlocks): bool + private function shouldRenderHtmlDebug(array $blocks): bool { - return count($templateBlocks) === 0 || $this->hasAnyBlockWithComponentOrTemplate($templateBlocks); - } - - /** - * @param array $templateBlocks - */ - private function hasAnyBlockWithComponentOrTemplate(array $templateBlocks): bool - { - foreach ($templateBlocks as $templateBlock) { - if (null !== $templateBlock->getComponent() || strrpos($templateBlock->getTemplate(), '.html.twig') !== false) { - return true; - } + if (0 === count($blocks)) { + return true; } - return false; + return 0 !== count( + array_filter($blocks, function (Block $block): bool { + return match (get_class($block)) { + TemplateBlock::class => strrpos($block->getTemplate(), '.html.twig') !== false, + ComponentBlock::class => true, + default => false, + }; + }), + ); } } + +class_alias(HtmlDebugTwigEventRenderer::class, '\Sylius\Bundle\UiBundle\Renderer\HtmlDebugTemplateEventRenderer'); diff --git a/src/Sylius/Bundle/UiBundle/Renderer/TemplateBlockRendererInterface.php b/src/Sylius/Bundle/UiBundle/Renderer/SupportableBlockRendererInterface.php similarity index 61% rename from src/Sylius/Bundle/UiBundle/Renderer/TemplateBlockRendererInterface.php rename to src/Sylius/Bundle/UiBundle/Renderer/SupportableBlockRendererInterface.php index 6e3c6ea86f..6cee458027 100644 --- a/src/Sylius/Bundle/UiBundle/Renderer/TemplateBlockRendererInterface.php +++ b/src/Sylius/Bundle/UiBundle/Renderer/SupportableBlockRendererInterface.php @@ -13,9 +13,9 @@ declare(strict_types=1); namespace Sylius\Bundle\UiBundle\Renderer; -use Sylius\Bundle\UiBundle\Registry\TemplateBlock; +use Sylius\Bundle\UiBundle\Registry\Block; -interface TemplateBlockRendererInterface +interface SupportableBlockRendererInterface extends BlockRendererInterface { - public function render(TemplateBlock $templateBlock, array $context = []): string; + public function supports(Block $block): bool; } diff --git a/src/Sylius/Bundle/UiBundle/Renderer/TwigComponentBlockRenderer.php b/src/Sylius/Bundle/UiBundle/Renderer/TwigComponentBlockRenderer.php index 6ccf48433b..99034e67ca 100644 --- a/src/Sylius/Bundle/UiBundle/Renderer/TwigComponentBlockRenderer.php +++ b/src/Sylius/Bundle/UiBundle/Renderer/TwigComponentBlockRenderer.php @@ -13,27 +13,71 @@ declare(strict_types=1); namespace Sylius\Bundle\UiBundle\Renderer; -use Sylius\Bundle\UiBundle\Registry\TemplateBlock; +use Sylius\Bundle\UiBundle\ContextProvider\ContextProviderInterface; +use Sylius\Bundle\UiBundle\Registry\Block; +use Sylius\Bundle\UiBundle\Registry\ComponentBlock; +use Symfony\Component\ExpressionLanguage\ExpressionLanguage; use Symfony\UX\TwigComponent\ComponentRendererInterface; /** @internal */ -final class TwigComponentBlockRenderer implements TemplateBlockRendererInterface +final class TwigComponentBlockRenderer implements SupportableBlockRendererInterface { public function __construct( - private TemplateBlockRendererInterface $decoratedRenderer, private ComponentRendererInterface $componentRenderer, + private ContextProviderInterface $contextProvider, + private ExpressionLanguage $expressionLanguage, ) { } /** + * @param ComponentBlock $templateBlock * @param array $context */ - public function render(TemplateBlock $templateBlock, array $context = []): string + public function render(Block $templateBlock, array $context = []): string { - if (null === $templateBlock->getComponent()) { - return $this->decoratedRenderer->render($templateBlock, $context); + if (!$this->supports($templateBlock)) { + throw new \InvalidArgumentException(sprintf( + 'Block "%s" is not supported by "%s".', + $templateBlock->getName(), + self::class, + )); } - return $this->componentRenderer->createAndRender($templateBlock->getComponent(), ['context' => $templateBlock->getContext() + $context]); + $context = $this->contextProvider->provide($context, $templateBlock); + + $inputs = $this->mapArrayRecursively(function (mixed $value) use ($context) { + if (!is_string($value)) { + return $value; + } + + if (!str_starts_with($value, 'expr:')) { + return $value; + } + + return $this->expressionLanguage->evaluate(substr($value, 5), $context); + }, $templateBlock->getComponentInputs()); + + return $this->componentRenderer->createAndRender($templateBlock->getComponentName(), $inputs); + } + + /** + * @param array $array + * @return array + */ + private function mapArrayRecursively(callable $callback, array $array): array + { + $result = []; + foreach ($array as $key => $value) { + $result[$key] = is_array($value) + ? $this->mapArrayRecursively($callback, $value) + : $callback($value); + } + + return $result; + } + + public function supports(Block $block): bool + { + return is_a($block, ComponentBlock::class); } } diff --git a/src/Sylius/Bundle/UiBundle/Renderer/TemplateEventRendererInterface.php b/src/Sylius/Bundle/UiBundle/Renderer/TwigEventRendererInterface.php similarity index 67% rename from src/Sylius/Bundle/UiBundle/Renderer/TemplateEventRendererInterface.php rename to src/Sylius/Bundle/UiBundle/Renderer/TwigEventRendererInterface.php index 6b5ac05849..d2cab201ec 100644 --- a/src/Sylius/Bundle/UiBundle/Renderer/TemplateEventRendererInterface.php +++ b/src/Sylius/Bundle/UiBundle/Renderer/TwigEventRendererInterface.php @@ -13,12 +13,13 @@ declare(strict_types=1); namespace Sylius\Bundle\UiBundle\Renderer; -interface TemplateEventRendererInterface +interface TwigEventRendererInterface { /** * @param string[] $eventNames - * - * @psalm-param non-empty-list $eventNames + * @param array $context */ public function render(array $eventNames, array $context = []): string; } + +class_alias(TwigEventRendererInterface::class, '\Sylius\Bundle\UiBundle\Renderer\TemplateEventRendererInterface'); diff --git a/src/Sylius/Bundle/UiBundle/Renderer/TwigTemplateBlockRenderer.php b/src/Sylius/Bundle/UiBundle/Renderer/TwigTemplateBlockRenderer.php index ddd43d61be..681acbb2fa 100644 --- a/src/Sylius/Bundle/UiBundle/Renderer/TwigTemplateBlockRenderer.php +++ b/src/Sylius/Bundle/UiBundle/Renderer/TwigTemplateBlockRenderer.php @@ -14,17 +14,32 @@ declare(strict_types=1); namespace Sylius\Bundle\UiBundle\Renderer; use Sylius\Bundle\UiBundle\ContextProvider\ContextProviderInterface; +use Sylius\Bundle\UiBundle\Registry\Block; use Sylius\Bundle\UiBundle\Registry\TemplateBlock; use Twig\Environment; -final class TwigTemplateBlockRenderer implements TemplateBlockRendererInterface +final class TwigTemplateBlockRenderer implements SupportableBlockRendererInterface { + /** + * @param iterable $contextProviders + */ public function __construct(private Environment $twig, private iterable $contextProviders) { } - public function render(TemplateBlock $templateBlock, array $context = []): string + /** + * @param TemplateBlock $templateBlock + */ + public function render(Block $templateBlock, array $context = []): string { + if (!$this->supports($templateBlock)) { + throw new \InvalidArgumentException(sprintf( + 'Block "%s" is not supported by "%s".', + $templateBlock->getName(), + self::class, + )); + } + foreach ($this->contextProviders as $contextProvider) { if (!$contextProvider instanceof ContextProviderInterface || !$contextProvider->supports($templateBlock)) { continue; @@ -35,4 +50,9 @@ final class TwigTemplateBlockRenderer implements TemplateBlockRendererInterface return $this->twig->render($templateBlock->getTemplate(), $context); } + + public function supports(Block $block): bool + { + return is_a($block, TemplateBlock::class); + } } diff --git a/src/Sylius/Bundle/UiBundle/Resources/config/services/debug/template_event.xml b/src/Sylius/Bundle/UiBundle/Resources/config/services/debug/template_event.xml index fdb8b75072..f52220ead8 100644 --- a/src/Sylius/Bundle/UiBundle/Resources/config/services/debug/template_event.xml +++ b/src/Sylius/Bundle/UiBundle/Resources/config/services/debug/template_event.xml @@ -13,30 +13,33 @@ - + - + - - - + + + + + + + + + - - - + + + - - - - - - + + + diff --git a/src/Sylius/Bundle/UiBundle/Resources/config/services/template_event.xml b/src/Sylius/Bundle/UiBundle/Resources/config/services/template_event.xml index 02d6a12799..70fd5ed48d 100644 --- a/src/Sylius/Bundle/UiBundle/Resources/config/services/template_event.xml +++ b/src/Sylius/Bundle/UiBundle/Resources/config/services/template_event.xml @@ -13,24 +13,34 @@ - + + + + + + - + + + - - + + + + - + - + + diff --git a/src/Sylius/Bundle/UiBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Sylius/Bundle/UiBundle/Tests/DependencyInjection/ConfigurationTest.php index 357a81b3b4..f440301034 100644 --- a/src/Sylius/Bundle/UiBundle/Tests/DependencyInjection/ConfigurationTest.php +++ b/src/Sylius/Bundle/UiBundle/Tests/DependencyInjection/ConfigurationTest.php @@ -213,6 +213,108 @@ final class ConfigurationTest extends TestCase ); } + /** @test */ + public function component_block_configuration_can_be_shortened_to_template_string_only(): void + { + $this->assertProcessedConfigurationEquals( + [ + [ + 'events' => [ + 'event_name' => [ + 'blocks' => [ + 'block_name' => [ + 'component' => 'component_name', + ], + ], + ], + ], + ], + ], + [ + 'events' => [ + 'event_name' => [ + 'blocks' => [ + 'block_name' => [ + 'component' => [ + 'name' => 'component_name', + ], + ], + ], + ], + ], + ], + 'events.*.blocks.*.component', + ); + } + + /** @test */ + public function component_block_configuration_can_be_defined_with_inputs(): void + { + $this->assertProcessedConfigurationEquals( + [ + [ + 'events' => [ + 'event_name' => [ + 'blocks' => [ + 'block_name' => [ + 'component' => [ + 'name' => 'component_name', + 'inputs' => [ + 'foo' => 'bar', + 'bar' => 'baz', + ], + ], + ], + ], + ], + ], + ], + ], + [ + 'events' => [ + 'event_name' => [ + 'blocks' => [ + 'block_name' => [ + 'component' => [ + 'name' => 'component_name', + 'inputs' => [ + 'foo' => 'bar', + 'bar' => 'baz', + ], + ], + ], + ], + ], + ], + ], + 'events.*.blocks.*.component', + ); + } + + /** @test */ + public function template_and_component_cannot_be_defined_at_the_same_time(): void + { + $this->assertPartialConfigurationIsInvalid( + [ + [ + 'events' => [ + 'event_name' => [ + 'blocks' => [ + 'block_name' => [ + 'template' => 'template.html.twig', + 'component' => [ + 'name' => 'component_name', + ], + ], + ], + ], + ], + ], + ], + 'events.*.blocks.*.template', + ); + } + protected function getConfiguration(): ConfigurationInterface { return new Configuration(); diff --git a/src/Sylius/Bundle/UiBundle/Tests/DependencyInjection/SyliusUiExtensionTest.php b/src/Sylius/Bundle/UiBundle/Tests/DependencyInjection/SyliusUiExtensionTest.php index f91dc8fe96..0632e0c9d6 100644 --- a/src/Sylius/Bundle/UiBundle/Tests/DependencyInjection/SyliusUiExtensionTest.php +++ b/src/Sylius/Bundle/UiBundle/Tests/DependencyInjection/SyliusUiExtensionTest.php @@ -15,8 +15,9 @@ namespace Sylius\Bundle\UiBundle\Tests\DependencyInjection; use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase; use Sylius\Bundle\UiBundle\DependencyInjection\SyliusUiExtension; +use Sylius\Bundle\UiBundle\Registry\BlockRegistryInterface; +use Sylius\Bundle\UiBundle\Registry\ComponentBlock; use Sylius\Bundle\UiBundle\Registry\TemplateBlock; -use Sylius\Bundle\UiBundle\Registry\TemplateBlockRegistryInterface; use Symfony\Component\DependencyInjection\Definition; final class SyliusUiExtensionTest extends AbstractExtensionTestCase @@ -30,6 +31,7 @@ final class SyliusUiExtensionTest extends AbstractExtensionTestCase 'first_event' => ['blocks' => [ 'first_block' => ['template' => 'first.html.twig', 'context' => [], 'enabled' => true, 'priority' => 0], 'second_block' => ['template' => 'second.html.twig', 'context' => ['foo' => 'bar'], 'enabled' => true, 'priority' => 0], + 'third_block' => ['component' => 'component_name', 'context' => [], 'enabled' => true, 'priority' => 0], ]], 'second_event' => ['blocks' => [ 'another_block' => ['template' => 'another.html.twig', 'context' => [], 'enabled' => true, 'priority' => 0], @@ -37,15 +39,16 @@ final class SyliusUiExtensionTest extends AbstractExtensionTestCase ]]); $this->assertContainerBuilderHasServiceDefinitionWithArgument( - TemplateBlockRegistryInterface::class, + BlockRegistryInterface::class, 0, [ 'first_event' => [ - 'first_block' => new Definition(TemplateBlock::class, ['first_block', 'first_event', 'first.html.twig', [], 0, true, null]), - 'second_block' => new Definition(TemplateBlock::class, ['second_block', 'first_event', 'second.html.twig', ['foo' => 'bar'], 0, true, null]), + 'first_block' => new Definition(TemplateBlock::class, ['first_block', 'first_event', 'first.html.twig', [], 0, true]), + 'second_block' => new Definition(TemplateBlock::class, ['second_block', 'first_event', 'second.html.twig', ['foo' => 'bar'], 0, true]), + 'third_block' => new Definition(ComponentBlock::class, ['third_block', 'first_event', 'component_name', [], [], 0, true]), ], 'second_event' => [ - 'another_block' => new Definition(TemplateBlock::class, ['another_block', 'second_event', 'another.html.twig', [], 0, true, null]), + 'another_block' => new Definition(TemplateBlock::class, ['another_block', 'second_event', 'another.html.twig', [], 0, true]), ], ], ); @@ -66,13 +69,13 @@ final class SyliusUiExtensionTest extends AbstractExtensionTestCase ]]); $this->assertContainerBuilderHasServiceDefinitionWithArgument( - TemplateBlockRegistryInterface::class, + BlockRegistryInterface::class, 0, ['event_name' => [ - 'first_block' => new Definition(TemplateBlock::class, ['first_block', 'event_name', 'first.html.twig', [], 5, true, null]), - 'second_block' => new Definition(TemplateBlock::class, ['second_block', 'event_name', 'second.html.twig', [], 0, true, null]), - 'third_block' => new Definition(TemplateBlock::class, ['third_block', 'event_name', 'third.html.twig', [], 0, true, null]), - 'fourth_block' => new Definition(TemplateBlock::class, ['fourth_block', 'event_name', 'fourth.html.twig', [], -5, true, null]), + 'first_block' => new Definition(TemplateBlock::class, ['first_block', 'event_name', 'first.html.twig', [], 5, true]), + 'second_block' => new Definition(TemplateBlock::class, ['second_block', 'event_name', 'second.html.twig', [], 0, true]), + 'third_block' => new Definition(TemplateBlock::class, ['third_block', 'event_name', 'third.html.twig', [], 0, true]), + 'fourth_block' => new Definition(TemplateBlock::class, ['fourth_block', 'event_name', 'fourth.html.twig', [], -5, true]), ]], ); } diff --git a/src/Sylius/Bundle/UiBundle/Tests/Functional/src/CustomContextProvider.php b/src/Sylius/Bundle/UiBundle/Tests/Functional/src/CustomContextProvider.php index 3250e3529a..2aba9c6afd 100644 --- a/src/Sylius/Bundle/UiBundle/Tests/Functional/src/CustomContextProvider.php +++ b/src/Sylius/Bundle/UiBundle/Tests/Functional/src/CustomContextProvider.php @@ -14,16 +14,16 @@ declare(strict_types=1); namespace Sylius\Bundle\UiBundle\Tests\Functional\src; use Sylius\Bundle\UiBundle\ContextProvider\ContextProviderInterface; -use Sylius\Bundle\UiBundle\Registry\TemplateBlock; +use Sylius\Bundle\UiBundle\Registry\Block; final class CustomContextProvider implements ContextProviderInterface { - public function provide(array $templateContext, TemplateBlock $templateBlock): array + public function provide(array $templateContext, Block $templateBlock): array { return $templateContext + ['custom' => 'yolo']; } - public function supports(TemplateBlock $templateBlock): bool + public function supports(Block $templateBlock): bool { return 'custom_context_provider' === $templateBlock->getEventName(); } diff --git a/src/Sylius/Bundle/UiBundle/Twig/TemplateEventExtension.php b/src/Sylius/Bundle/UiBundle/Twig/TemplateEventExtension.php index f4d4d38670..62ca90b8e4 100644 --- a/src/Sylius/Bundle/UiBundle/Twig/TemplateEventExtension.php +++ b/src/Sylius/Bundle/UiBundle/Twig/TemplateEventExtension.php @@ -13,14 +13,14 @@ declare(strict_types=1); namespace Sylius\Bundle\UiBundle\Twig; -use Sylius\Bundle\UiBundle\Renderer\TemplateEventRendererInterface; +use Sylius\Bundle\UiBundle\Renderer\TwigEventRendererInterface; use Twig\Extension\AbstractExtension; use Twig\TwigFunction; use Webmozart\Assert\Assert; final class TemplateEventExtension extends AbstractExtension { - public function __construct(private TemplateEventRendererInterface $templateEventRenderer) + public function __construct(private TwigEventRendererInterface $templateEventRenderer) { } diff --git a/src/Sylius/Bundle/UiBundle/spec/ContextProvider/CompositeContextProviderSpec.php b/src/Sylius/Bundle/UiBundle/spec/ContextProvider/CompositeContextProviderSpec.php new file mode 100644 index 0000000000..9838a8aa00 --- /dev/null +++ b/src/Sylius/Bundle/UiBundle/spec/ContextProvider/CompositeContextProviderSpec.php @@ -0,0 +1,77 @@ +beConstructedWith([]); + + $this->shouldImplement(ContextProviderInterface::class); + } + + function it_throws_an_exception_when_any_of_passed_context_providers_is_not_a_context_provider(): void + { + $this->beConstructedWith([new \stdClass()]); + + $this->shouldThrow(InvalidArgumentException::class)->duringInstantiation(); + } + + function it_throws_an_exception_when_no_context_provider_supports_a_given_block( + ContextProviderInterface $someContextProvider, + Block $someBlock, + ): void { + $someBlock->getName()->willReturn('some_block'); + + $someContextProvider->supports($someBlock)->willReturn(false); + + $this->beConstructedWith([$someContextProvider]); + + $this->shouldThrow(new NoSupportedContextProvider('No supported context provider found for block "some_block".'))->during('provide', [[], $someBlock]); + } + + function it_returns_always_true_for_supports(Block $someBlock): void + { + $this->beConstructedWith([]); + + $this->supports($someBlock)->shouldReturn(true); + } + + function it_returns_a_context_for_a_first_supported_context_provider( + ContextProviderInterface $someContextProvider, + ContextProviderInterface $anotherContextProvider, + ContextProviderInterface $yetAnotherContextProvider, + Block $someBlock, + ): void { + $someBlock->getName()->willReturn('some_block'); + + $someContextProvider->supports($someBlock)->willReturn(false); + + $anotherContextProvider->supports($someBlock)->willReturn(true); + $anotherContextProvider->provide(['foo' => 'bar'], $someBlock)->willReturn(['foo' => 'qux']); + + $yetAnotherContextProvider->supports($someBlock)->shouldNotBeCalled(); + + $this->beConstructedWith([$someContextProvider, $anotherContextProvider]); + + $this->provide(['foo' => 'bar'], $someBlock)->shouldReturn(['foo' => 'qux']); + } +} diff --git a/src/Sylius/Bundle/UiBundle/spec/Registry/TemplateBlockRegistrySpec.php b/src/Sylius/Bundle/UiBundle/spec/Registry/BlockRegistrySpec.php similarity index 80% rename from src/Sylius/Bundle/UiBundle/spec/Registry/TemplateBlockRegistrySpec.php rename to src/Sylius/Bundle/UiBundle/spec/Registry/BlockRegistrySpec.php index aad07c5dae..4ad2c51163 100644 --- a/src/Sylius/Bundle/UiBundle/spec/Registry/TemplateBlockRegistrySpec.php +++ b/src/Sylius/Bundle/UiBundle/spec/Registry/BlockRegistrySpec.php @@ -14,19 +14,20 @@ declare(strict_types=1); namespace spec\Sylius\Bundle\UiBundle\Registry; use PhpSpec\ObjectBehavior; +use Sylius\Bundle\UiBundle\Registry\BlockRegistryInterface; +use Sylius\Bundle\UiBundle\Registry\ComponentBlock; use Sylius\Bundle\UiBundle\Registry\TemplateBlock; -use Sylius\Bundle\UiBundle\Registry\TemplateBlockRegistryInterface; -final class TemplateBlockRegistrySpec extends ObjectBehavior +final class BlockRegistrySpec extends ObjectBehavior { function let(): void { $this->beConstructedWith([]); } - function it_is_a_template_block_registry(): void + function it_is_a_block_registry(): void { - $this->shouldImplement(TemplateBlockRegistryInterface::class); + $this->shouldImplement(BlockRegistryInterface::class); } function it_returns_all_template_blocks(): void @@ -38,26 +39,28 @@ final class TemplateBlockRegistrySpec extends ObjectBehavior $this->all()->shouldReturn(['event' => ['block_name' => $templateBlock]]); } - function it_returns_enabled_template_blocks_for_a_given_event(): void + function it_returns_enabled_blocks_for_a_given_event(): void { - $firstTemplateBlock = new TemplateBlock('first_block', 'event', 'first.html.twig', [], 0, true, null); - $secondTemplateBlock = new TemplateBlock('second_block', 'event', 'second.html.twig', [], 10, false, null); - $thirdTemplateBlock = new TemplateBlock('third_block', 'event', 'third.html.twig', [], 50, true, null); + $firstBlock = new TemplateBlock('first_block', 'event', 'first.html.twig', [], 0, true, null); + $secondBlock = new TemplateBlock('second_block', 'event', 'second.html.twig', [], 10, false, null); + $thirdBlock = new TemplateBlock('third_block', 'event', 'third.html.twig', [], 50, true, null); + $fourthBlock = new ComponentBlock('fourth_block', 'event', 'fourth.html.twig', [], [], 0, null); $this->beConstructedWith([ 'event' => [ - 'first_block' => $firstTemplateBlock, - 'second_block' => $secondTemplateBlock, + 'first_block' => $firstBlock, + 'second_block' => $secondBlock, ], 'another_event' => [ - 'third_block' => $thirdTemplateBlock, + 'third_block' => $thirdBlock, + 'fourth_block' => $fourthBlock, ], ]); - $this->findEnabledForEvents(['event'])->shouldReturn([$firstTemplateBlock]); + $this->findEnabledForEvents(['event'])->shouldReturn([$firstBlock]); } - function it_returns_enabled_template_blocks_for_multiple_events(): void + function it_returns_enabled_blocks_for_multiple_events(): void { $this->beConstructedWith([ 'generic_event' => ['block' => new TemplateBlock('block', 'generic_event', 'generic.html.twig', ['foo' => 'bar'], 0, true)], @@ -82,7 +85,7 @@ final class TemplateBlockRegistrySpec extends ObjectBehavior ]); } - function it_returns_enabled_template_blocks_sorted_by_priority_for_multiple_events(): void + function it_returns_enabled_blocks_sorted_by_priority_for_multiple_events(): void { $this->beConstructedWith([ 'generic_event' => [ diff --git a/src/Sylius/Bundle/UiBundle/spec/Registry/ComponentBlockSpec.php b/src/Sylius/Bundle/UiBundle/spec/Registry/ComponentBlockSpec.php new file mode 100644 index 0000000000..d80597d49a --- /dev/null +++ b/src/Sylius/Bundle/UiBundle/spec/Registry/ComponentBlockSpec.php @@ -0,0 +1,100 @@ +beConstructedWith('block_name', 'event_name', 'MyComponent', ['my' => 'input'], ['my' => 'context'], 10, false); + + $this->getName()->shouldReturn('block_name'); + $this->getEventName()->shouldReturn('event_name'); + $this->getComponentName()->shouldReturn('MyComponent'); + $this->getComponentInputs()->shouldReturn(['my' => 'input']); + $this->getContext()->shouldReturn(['my' => 'context']); + $this->getPriority()->shouldReturn(10); + $this->isEnabled()->shouldReturn(false); + } + + function it_overwrites_a_component_block_with_an_another_component_block(): void + { + $this->beConstructedWith('block_name', 'event_name', 'MyComponent', ['my' => 'input'], ['my' => 'context'], 10, false); + + $this + ->overwriteWith( + new ComponentBlock( + 'block_name', + 'specific_event_name', + 'MyAnotherComponent', + ['my' => 'another_input'], + ['my' => 'another_context'], + 20, + true, + ), + ) + ->shouldBeLike( + new ComponentBlock( + 'block_name', + 'specific_event_name', + 'MyAnotherComponent', + ['my' => 'another_input'], + ['my' => 'another_context'], + 20, + true, + ), + ) + ; + } + + function it_throws_an_exception_if_trying_to_overwrite_with_a_differently_named_block(): void + { + $this->beConstructedWith('block_name', 'event_name', 'MyComponent', ['my' => 'input'], ['my' => 'context'], 10, false); + + $this->shouldThrow(\DomainException::class)->during( + 'overwriteWith', + [ + new ComponentBlock( + 'another_block_name', + 'specific_event_name', + 'MyComponent', + [], + [], + 0, + false, + ), + ], + ); + } + + function it_throws_an_exception_when_trying_to_override_template_block_with_template_block(): void + { + $this->beConstructedWith('block_name', 'event_name', 'MyComponent', ['my' => 'input'], ['my' => 'context'], 10, false); + + $exceptionMessage = sprintf( + 'Trying to overwrite component block "%s" with block of different type "%s".', + 'block_name', + 'Sylius\Bundle\UiBundle\Registry\TemplateBlock', + ); + + $this + ->shouldThrow(new \DomainException($exceptionMessage)) + ->during('overwriteWith', [new TemplateBlock('block_name', 'specific_event_name', null, null, null, true)]) + ; + } +} diff --git a/src/Sylius/Bundle/UiBundle/spec/Registry/TemplateBlockSpec.php b/src/Sylius/Bundle/UiBundle/spec/Registry/TemplateBlockSpec.php index 01679f729b..6d31169e2b 100644 --- a/src/Sylius/Bundle/UiBundle/spec/Registry/TemplateBlockSpec.php +++ b/src/Sylius/Bundle/UiBundle/spec/Registry/TemplateBlockSpec.php @@ -14,18 +14,18 @@ declare(strict_types=1); namespace spec\Sylius\Bundle\UiBundle\Registry; use PhpSpec\ObjectBehavior; +use Sylius\Bundle\UiBundle\Registry\ComponentBlock; use Sylius\Bundle\UiBundle\Registry\TemplateBlock; final class TemplateBlockSpec extends ObjectBehavior { function it_represents_a_template_block(): void { - $this->beConstructedWith('block_name', 'event_name', 'block.html.twig', ['foo' => 'bar'], 10, false, null); + $this->beConstructedWith('block_name', 'event_name', 'block.html.twig', ['foo' => 'bar'], 10, false); $this->getName()->shouldReturn('block_name'); $this->getEventName()->shouldReturn('event_name'); $this->getTemplate()->shouldReturn('block.html.twig'); - $this->getComponent()->shouldReturn(null); $this->getContext()->shouldReturn(['foo' => 'bar']); $this->getPriority()->shouldReturn(10); $this->isEnabled()->shouldReturn(false); @@ -33,43 +33,59 @@ final class TemplateBlockSpec extends ObjectBehavior function it_overwrites_a_template_block_with_an_another_template_block(): void { - $this->beConstructedWith('block_name', 'event_name', 'block.html.twig', ['foo' => 'bar'], 10, false, null); + $this->beConstructedWith('block_name', 'event_name', 'block.html.twig', ['foo' => 'bar'], 10, false); $this - ->overwriteWith(new TemplateBlock('block_name', 'specific_event_name', 'another.html.twig', null, null, null, 'some_component')) - ->shouldBeLike(new TemplateBlock('block_name', 'specific_event_name', 'another.html.twig', ['foo' => 'bar'], 10, false, 'some_component')) + ->overwriteWith(new TemplateBlock('block_name', 'specific_event_name', 'another.html.twig', null, null, null)) + ->shouldBeLike(new TemplateBlock('block_name', 'specific_event_name', 'another.html.twig', ['foo' => 'bar'], 10, false)) ; $this - ->overwriteWith(new TemplateBlock('block_name', 'specific_event_name', null, [], null, null, null)) - ->shouldBeLike(new TemplateBlock('block_name', 'specific_event_name', 'block.html.twig', [], 10, false, null)) + ->overwriteWith(new TemplateBlock('block_name', 'specific_event_name', null, [], null, null)) + ->shouldBeLike(new TemplateBlock('block_name', 'specific_event_name', 'block.html.twig', [], 10, false)) ; $this - ->overwriteWith(new TemplateBlock('block_name', 'specific_event_name', null, null, -5, null, null)) - ->shouldBeLike(new TemplateBlock('block_name', 'specific_event_name', 'block.html.twig', ['foo' => 'bar'], -5, false, null)) + ->overwriteWith(new TemplateBlock('block_name', 'specific_event_name', null, null, -5, null)) + ->shouldBeLike(new TemplateBlock('block_name', 'specific_event_name', 'block.html.twig', ['foo' => 'bar'], -5, false)) ; $this - ->overwriteWith(new TemplateBlock('block_name', 'specific_event_name', null, null, null, true, null)) - ->shouldBeLike(new TemplateBlock('block_name', 'specific_event_name', 'block.html.twig', ['foo' => 'bar'], 10, true, null)) + ->overwriteWith(new TemplateBlock('block_name', 'specific_event_name', null, null, null, true)) + ->shouldBeLike(new TemplateBlock('block_name', 'specific_event_name', 'block.html.twig', ['foo' => 'bar'], 10, true)) ; } function it_throws_an_exception_if_trying_to_overwrite_with_a_differently_named_block(): void { - $this->beConstructedWith('block_name', 'event_name', 'block.html.twig', ['foo' => 'bar'], 10, false, null); + $this->beConstructedWith('block_name', 'event_name', 'block.html.twig', ['foo' => 'bar'], 10, false); - $this->shouldThrow(\DomainException::class)->during('overwriteWith', [new TemplateBlock('different_name', 'specific_event_name', null, null, null, null, null)]); + $this->shouldThrow(\DomainException::class)->during('overwriteWith', [new TemplateBlock('different_name', 'specific_event_name', null, null, null, null)]); } function it_has_sensible_defaults(): void { - $this->beConstructedWith('block_name', 'event_name', null, null, null, null, null); + $this->beConstructedWith('block_name', 'event_name', null, null, null, null); $this->shouldThrow(\DomainException::class)->during('getTemplate'); $this->getContext()->shouldReturn([]); $this->getPriority()->shouldReturn(0); $this->isEnabled()->shouldReturn(true); } + + function it_throws_an_exception_when_trying_to_override_template_block_with_component_block(): void + { + $this->beConstructedWith('block_name', 'event_name', 'block.html.twig', ['foo' => 'bar'], 10, false); + + $exceptionMessage = sprintf( + 'Trying to overwrite template block "%s" with block of different type "%s".', + 'block_name', + 'Sylius\Bundle\UiBundle\Registry\ComponentBlock', + ); + + $this + ->shouldThrow(new \DomainException($exceptionMessage)) + ->during('overwriteWith', [new ComponentBlock('block_name', 'specific_event_name', 'MyComponent', [], [], 0, false)]) + ; + } } diff --git a/src/Sylius/Bundle/UiBundle/spec/Renderer/CompositeBlockRendererSpec.php b/src/Sylius/Bundle/UiBundle/spec/Renderer/CompositeBlockRendererSpec.php new file mode 100644 index 0000000000..4f2f65282c --- /dev/null +++ b/src/Sylius/Bundle/UiBundle/spec/Renderer/CompositeBlockRendererSpec.php @@ -0,0 +1,74 @@ +beConstructedWith([]); + + $this->shouldImplement(BlockRendererInterface::class); + } + + function it_throws_an_exception_when_any_of_passed_block_renderers_is_not_a_block_renderer(): void + { + $this->beConstructedWith([new \stdClass()]); + + $this->shouldThrow(InvalidArgumentException::class)->duringInstantiation(); + } + + function it_throws_an_exception_when_no_block_renderers_supports_a_given_block( + SupportableBlockRendererInterface $someBlockRenderer, + Block $someBlock, + ): void { + $someBlock->getName()->willReturn('some_block'); + + $someBlockRenderer->supports($someBlock)->willReturn(false); + + $this->beConstructedWith([$someBlockRenderer]); + + $this + ->shouldThrow(new NoSupportedBlockRenderer('No supported block renderer found for "some_block" block.')) + ->during('render', [$someBlock, []]) + ; + } + + function it_renders_a_block_using_a_first_supported_block_renderer( + SupportableBlockRendererInterface $someBlockRenderer, + SupportableBlockRendererInterface $anotherBlockRenderer, + SupportableBlockRendererInterface $yetAnotherBlockRenderer, + Block $someBlock, + ): void { + $someBlock->getName()->willReturn('some_block'); + + $someBlockRenderer->supports($someBlock)->willReturn(false); + + $anotherBlockRenderer->supports($someBlock)->willReturn(true); + $anotherBlockRenderer->render($someBlock, [])->willReturn('Rendered block'); + + $yetAnotherBlockRenderer->supports($someBlock)->shouldNotBeCalled(); + + $this->beConstructedWith([$someBlockRenderer, $anotherBlockRenderer, $yetAnotherBlockRenderer]); + + $this->render($someBlock, [])->shouldReturn('Rendered block'); + } +} diff --git a/src/Sylius/Bundle/UiBundle/spec/Renderer/DelegatingTemplateEventRendererSpec.php b/src/Sylius/Bundle/UiBundle/spec/Renderer/DelegatingTwigEventRendererSpec.php similarity index 65% rename from src/Sylius/Bundle/UiBundle/spec/Renderer/DelegatingTemplateEventRendererSpec.php rename to src/Sylius/Bundle/UiBundle/spec/Renderer/DelegatingTwigEventRendererSpec.php index e1d080ca65..3f11dd4fdc 100644 --- a/src/Sylius/Bundle/UiBundle/spec/Renderer/DelegatingTemplateEventRendererSpec.php +++ b/src/Sylius/Bundle/UiBundle/spec/Renderer/DelegatingTwigEventRendererSpec.php @@ -15,26 +15,26 @@ namespace spec\Sylius\Bundle\UiBundle\Renderer; use PhpSpec\ObjectBehavior; use Prophecy\Argument; +use Sylius\Bundle\UiBundle\Registry\BlockRegistryInterface; use Sylius\Bundle\UiBundle\Registry\TemplateBlock; -use Sylius\Bundle\UiBundle\Registry\TemplateBlockRegistryInterface; -use Sylius\Bundle\UiBundle\Renderer\TemplateBlockRendererInterface; -use Sylius\Bundle\UiBundle\Renderer\TemplateEventRendererInterface; +use Sylius\Bundle\UiBundle\Renderer\BlockRendererInterface; +use Sylius\Bundle\UiBundle\Renderer\TwigEventRendererInterface; -final class DelegatingTemplateEventRendererSpec extends ObjectBehavior +final class DelegatingTwigEventRendererSpec extends ObjectBehavior { - function let(TemplateBlockRegistryInterface $templateBlockRegistry, TemplateBlockRendererInterface $templateBlockRenderer): void + function let(BlockRegistryInterface $templateBlockRegistry, BlockRendererInterface $templateBlockRenderer): void { $this->beConstructedWith($templateBlockRegistry, $templateBlockRenderer); } - function it_is_a_template_event_renderer(): void + function it_is_a_twig_event_renderer(): void { - $this->shouldImplement(TemplateEventRendererInterface::class); + $this->shouldImplement(TwigEventRendererInterface::class); } - function it_renders_template_events( - TemplateBlockRegistryInterface $templateBlockRegistry, - TemplateBlockRendererInterface $templateBlockRenderer, + function it_renders_blocks_for_a_given_template( + BlockRegistryInterface $templateBlockRegistry, + BlockRendererInterface $templateBlockRenderer, ): void { $firstTemplateBlock = new TemplateBlock('first_block', 'best_event_ever', 'firstBlock.txt.twig', [], 0, true, null); $secondTemplateBlock = new TemplateBlock('second_block', 'best_event_ever', 'secondBlock.txt.twig', [], 0, true, null); @@ -48,8 +48,8 @@ final class DelegatingTemplateEventRendererSpec extends ObjectBehavior } function it_returns_an_empty_string_if_no_blocks_are_found_for_an_event( - TemplateBlockRegistryInterface $templateBlockRegistry, - TemplateBlockRendererInterface $templateBlockRenderer, + BlockRegistryInterface $templateBlockRegistry, + BlockRendererInterface $templateBlockRenderer, ): void { $templateBlockRegistry->findEnabledForEvents(['best_event_ever'])->willReturn([]); diff --git a/src/Sylius/Bundle/UiBundle/spec/Renderer/HtmlDebugBlockRendererSpec.php b/src/Sylius/Bundle/UiBundle/spec/Renderer/HtmlDebugBlockRendererSpec.php new file mode 100644 index 0000000000..c8ddb40413 --- /dev/null +++ b/src/Sylius/Bundle/UiBundle/spec/Renderer/HtmlDebugBlockRendererSpec.php @@ -0,0 +1,70 @@ +beConstructedWith($templateBlockRenderer); + } + + function it_is_a_block_renderer(): void + { + $this->shouldImplement(BlockRendererInterface::class); + } + + function it_does_not_render_html_debug_comment_if_template_block_is_not_an_html_twig_file_path( + BlockRendererInterface $templateBlockRenderer, + ): void { + $templateBlock = new TemplateBlock('block_name', 'event_name', 'template', [], 0, true); + + $templateBlockRenderer->render($templateBlock, [])->willReturn('template'); + + $this->render($templateBlock)->shouldReturn('template'); + } + + function it_renders_html_debug_comment_if_template_block_is_an_html_twig_file_path( + BlockRendererInterface $templateBlockRenderer, + ): void { + $templateBlock = new TemplateBlock('block_name', 'event_name', 'template.html.twig', [], 0, true); + + $templateBlockRenderer->render($templateBlock, [])->willReturn('template'); + + $this->render($templateBlock)->shouldReturn( + '' . "\n" . + 'template' . "\n" . + '', + ); + } + + function it_renders_html_debug_comment_if_the_block_is_a_component( + BlockRendererInterface $templateBlockRenderer, + ): void { + $componentBlock = new ComponentBlock('block_name', 'event_name', 'Component', [], [], 0, true); + + $templateBlockRenderer->render($componentBlock, ['some' => 'context'])->willReturn('template'); + + $this->render($componentBlock, ['some' => 'context'])->shouldReturn( + '' . "\n" . + 'template' . "\n" . + '', + ); + } +} diff --git a/src/Sylius/Bundle/UiBundle/spec/Renderer/HtmlDebugTemplateBlockRendererSpec.php b/src/Sylius/Bundle/UiBundle/spec/Renderer/HtmlDebugTemplateBlockRendererSpec.php deleted file mode 100644 index b2a7a50ca2..0000000000 --- a/src/Sylius/Bundle/UiBundle/spec/Renderer/HtmlDebugTemplateBlockRendererSpec.php +++ /dev/null @@ -1,69 +0,0 @@ -beConstructedWith($templateBlockRenderer); - } - - function it_is_a_template_block_renderer(): void - { - $this->shouldImplement(TemplateBlockRendererInterface::class); - } - - function it_does_not_render_a_debug_html_comment_if_the_template_block_is_not_a_component_nor_a_twig_template( - TemplateBlockRendererInterface $templateBlockRenderer, - ): void { - $templateBlock = new TemplateBlock('block_name', 'event_name', 'some_content', null, null, true, null); - - $templateBlockRenderer->render($templateBlock, [])->willReturn('Rendered template'); - - $this->render($templateBlock, [])->shouldReturn('Rendered template'); - } - - function it_renders_a_debug_html_comment_if_the_template_block_has_a_configured_component( - TemplateBlockRendererInterface $templateBlockRenderer, - ): void { - $templateBlock = new TemplateBlock('block_name', 'event_name', 'some_content', null, null, true, 'component_name'); - - $templateBlockRenderer->render($templateBlock, [])->willReturn('Rendered template'); - - $this->render($templateBlock, [])->shouldReturn( - '' . "\n" . - 'Rendered template' . "\n" . - '' - ); - } - - function it_renders_a_debug_html_comment_if_the_template_block_has_a_configured_twig_template( - TemplateBlockRendererInterface $templateBlockRenderer, - ): void { - $templateBlock = new TemplateBlock('block_name', 'event_name', 'template.html.twig', [], null, true, null); - - $templateBlockRenderer->render($templateBlock, [])->willReturn('Rendered template'); - - $this->render($templateBlock, [])->shouldReturn( - '' . "\n" . - 'Rendered template' . "\n" . - '' - ); - } -} diff --git a/src/Sylius/Bundle/UiBundle/spec/Renderer/HtmlDebugTemplateEventRendererSpec.php b/src/Sylius/Bundle/UiBundle/spec/Renderer/HtmlDebugTwigEventRendererSpec.php similarity index 65% rename from src/Sylius/Bundle/UiBundle/spec/Renderer/HtmlDebugTemplateEventRendererSpec.php rename to src/Sylius/Bundle/UiBundle/spec/Renderer/HtmlDebugTwigEventRendererSpec.php index 34d626a3bc..b3af03804d 100644 --- a/src/Sylius/Bundle/UiBundle/spec/Renderer/HtmlDebugTemplateEventRendererSpec.php +++ b/src/Sylius/Bundle/UiBundle/spec/Renderer/HtmlDebugTwigEventRendererSpec.php @@ -14,25 +14,26 @@ declare(strict_types=1); namespace spec\Sylius\Bundle\UiBundle\Renderer; use PhpSpec\ObjectBehavior; +use Sylius\Bundle\UiBundle\Registry\BlockRegistryInterface; +use Sylius\Bundle\UiBundle\Registry\ComponentBlock; use Sylius\Bundle\UiBundle\Registry\TemplateBlock; -use Sylius\Bundle\UiBundle\Registry\TemplateBlockRegistryInterface; -use Sylius\Bundle\UiBundle\Renderer\TemplateEventRendererInterface; +use Sylius\Bundle\UiBundle\Renderer\TwigEventRendererInterface; -final class HtmlDebugTemplateEventRendererSpec extends ObjectBehavior +final class HtmlDebugTwigEventRendererSpec extends ObjectBehavior { - function let(TemplateEventRendererInterface $templateEventRenderer, TemplateBlockRegistryInterface $templateBlockRegistry): void + function let(TwigEventRendererInterface $templateEventRenderer, BlockRegistryInterface $templateBlockRegistry): void { $this->beConstructedWith($templateEventRenderer, $templateBlockRegistry); } function it_is_a_template_event_renderer(): void { - $this->shouldImplement(TemplateEventRendererInterface::class); + $this->shouldImplement(TwigEventRendererInterface::class); } function it_does_not_render_html_debug_comments_when_there_are_no_template_blocks_with_a_defined_component_nor_template( - TemplateEventRendererInterface $templateEventRenderer, - TemplateBlockRegistryInterface $templateBlockRegistry + TwigEventRendererInterface $templateEventRenderer, + BlockRegistryInterface $templateBlockRegistry, ): void { $templateBlockRegistry->findEnabledForEvents(['event_name'])->willReturn([ new TemplateBlock('some_block_one', 'some_event', 'some content', null, null, true, null), @@ -44,8 +45,8 @@ final class HtmlDebugTemplateEventRendererSpec extends ObjectBehavior } function it_renders_html_debug_comment_when_no_template_block_passed( - TemplateEventRendererInterface $templateEventRenderer, - TemplateBlockRegistryInterface $templateBlockRegistry + TwigEventRendererInterface $templateEventRenderer, + BlockRegistryInterface $templateBlockRegistry, ): void { $templateBlockRegistry->findEnabledForEvents(['event_name'])->willReturn([]); @@ -54,16 +55,16 @@ final class HtmlDebugTemplateEventRendererSpec extends ObjectBehavior $this->render(['event_name'])->shouldReturn( '' . "\n" . 'rendered_content' . "\n" . - '' + '', ); } function it_renders_html_debug_comment_when_at_least_one_block_has_a_configured_component( - TemplateEventRendererInterface $templateEventRenderer, - TemplateBlockRegistryInterface $templateBlockRegistry + TwigEventRendererInterface $templateEventRenderer, + BlockRegistryInterface $templateBlockRegistry, ): void { $templateBlockRegistry->findEnabledForEvents(['event_name'])->willReturn([ - new TemplateBlock('some_block_one', 'some_event', 'some content', null, null, true, 'SomeComponent'), + new ComponentBlock('some_block_one', 'some_event', 'Component', [], [], 0, true), ]); $templateEventRenderer->render(['event_name'], [])->willReturn('rendered_content'); @@ -71,16 +72,16 @@ final class HtmlDebugTemplateEventRendererSpec extends ObjectBehavior $this->render(['event_name'])->shouldReturn( '' . "\n" . 'rendered_content' . "\n" . - '' + '', ); } function it_renders_html_debug_comment_when_at_least_one_block_has_a_configured_twig_template( - TemplateEventRendererInterface $templateEventRenderer, - TemplateBlockRegistryInterface $templateBlockRegistry + TwigEventRendererInterface $templateEventRenderer, + BlockRegistryInterface $templateBlockRegistry, ): void { $templateBlockRegistry->findEnabledForEvents(['event_name'])->willReturn([ - new TemplateBlock('some_block_one', 'some_event', 'some_template.html.twig', null, null, true, null), + new TemplateBlock('some_block_one', 'some_event', 'template.html.twig', null, null, true), ]); $templateEventRenderer->render(['event_name'], [])->willReturn('rendered_content'); @@ -88,7 +89,7 @@ final class HtmlDebugTemplateEventRendererSpec extends ObjectBehavior $this->render(['event_name'])->shouldReturn( '' . "\n" . 'rendered_content' . "\n" . - '' + '', ); } } diff --git a/src/Sylius/Bundle/UiBundle/spec/Renderer/TwigComponentBlockRendererSpec.php b/src/Sylius/Bundle/UiBundle/spec/Renderer/TwigComponentBlockRendererSpec.php index 67c9b23678..2f4d13b023 100644 --- a/src/Sylius/Bundle/UiBundle/spec/Renderer/TwigComponentBlockRendererSpec.php +++ b/src/Sylius/Bundle/UiBundle/spec/Renderer/TwigComponentBlockRendererSpec.php @@ -14,51 +14,91 @@ declare(strict_types=1); namespace spec\Sylius\Bundle\UiBundle\Renderer; use PhpSpec\ObjectBehavior; +use Sylius\Bundle\UiBundle\ContextProvider\ContextProviderInterface; +use Sylius\Bundle\UiBundle\Registry\ComponentBlock; use Sylius\Bundle\UiBundle\Registry\TemplateBlock; -use Sylius\Bundle\UiBundle\Renderer\TemplateBlockRendererInterface; +use Symfony\Component\ExpressionLanguage\ExpressionLanguage; use Symfony\UX\TwigComponent\ComponentRendererInterface; final class TwigComponentBlockRendererSpec extends ObjectBehavior { - function let(TemplateBlockRendererInterface $decoratedRenderer, ComponentRendererInterface $componentRenderer): void - { - $this->beConstructedWith($decoratedRenderer, $componentRenderer); - } - - function it_invokes_decorated_renderer_when_no_component_is_set( - TemplateBlockRendererInterface $decoratedRenderer, - ): void { - $someTemplateBlock = new TemplateBlock( - 'some_name', - 'some_event_name', - 'some_template', - ['some' => 'context'], - 0, - true, - null, - ); - $decoratedRenderer->render($someTemplateBlock, ['some' => 'context'])->shouldBeCalled(); - - $this->render($someTemplateBlock, ['some' => 'context']); - } - - function it_renders_a_component_when_component_is_set( + function let( ComponentRendererInterface $componentRenderer, + ContextProviderInterface $contextProvider, + ExpressionLanguage $expressionLanguage, ): void { - $someTemplateBlock = new TemplateBlock( - 'some_name', - 'some_event_name', - 'some_template', - ['another' => 'value'], + $this->beConstructedWith( + $componentRenderer, + $contextProvider, + $expressionLanguage, + ); + } + + function it_returns_true_if_block_is_supported(): void + { + $templateBlock = new TemplateBlock('block_name', 'event_name', 'template.html.twig', [], 0, true); + $componentBlock = new ComponentBlock('block_name', 'event_name', 'Component', [], [], 0, true); + + $this->supports($templateBlock)->shouldReturn(false); + $this->supports($componentBlock)->shouldReturn(true); + } + + function it_throws_an_exception_when_trying_to_render_unsupported_block(): void + { + $templateBlock = new TemplateBlock('block_name', 'event_name', 'template.html.twig', [], 0, true); + + $this + ->shouldThrow(\InvalidArgumentException::class) + ->during('render', [$templateBlock]) + ; + } + + function it_renders_component_block( + ComponentRendererInterface $componentRenderer, + ContextProviderInterface $contextProvider, + ExpressionLanguage $expressionLanguage, + ): void { + $componentBlock = new ComponentBlock( + 'block_name', + 'event_name', + 'Component', + [ + 'foo' => 'bar', + 'bar' => 'expr:foo', + 'nested' => [ + 'foo' => 'expr:bar', + 'bar' => 'expr:baz', + ], + ], + [], 0, true, - 'some_component', ); + + $context = [ + 'foo' => 'bar', + 'bar' => 'baz', + 'baz' => 'qux', + ]; + + $contextProvider->provide([], $componentBlock)->willReturn($context); + + $expressionLanguage->evaluate('foo', $context)->willReturn('bar'); + $expressionLanguage->evaluate('bar', $context)->willReturn('baz'); + $expressionLanguage->evaluate('baz', $context)->willReturn('qux'); + $componentRenderer - ->createAndRender('some_component', ['context' => ['another' => 'value', 'some' => 'value']]) - ->willReturn('some_rendered_component') + ->createAndRender('Component', [ + 'foo' => 'bar', + 'bar' => 'bar', + 'nested' => [ + 'foo' => 'baz', + 'bar' => 'qux', + ], + ]) + ->willReturn('rendered_component') ; - $this->render($someTemplateBlock, ['some' => 'value'])->shouldReturn('some_rendered_component'); + $this->render($componentBlock)->shouldReturn('rendered_component'); } } diff --git a/src/Sylius/Bundle/UiBundle/spec/Renderer/TwigTemplateBlockRendererSpec.php b/src/Sylius/Bundle/UiBundle/spec/Renderer/TwigTemplateBlockRendererSpec.php index 57b504e67f..76354358b8 100644 --- a/src/Sylius/Bundle/UiBundle/spec/Renderer/TwigTemplateBlockRendererSpec.php +++ b/src/Sylius/Bundle/UiBundle/spec/Renderer/TwigTemplateBlockRendererSpec.php @@ -16,8 +16,9 @@ namespace spec\Sylius\Bundle\UiBundle\Renderer; use PhpSpec\ObjectBehavior; use Prophecy\Argument; use Sylius\Bundle\UiBundle\ContextProvider\ContextProviderInterface; +use Sylius\Bundle\UiBundle\Registry\ComponentBlock; use Sylius\Bundle\UiBundle\Registry\TemplateBlock; -use Sylius\Bundle\UiBundle\Renderer\TemplateBlockRendererInterface; +use Sylius\Bundle\UiBundle\Renderer\BlockRendererInterface; use Twig\Environment; final class TwigTemplateBlockRendererSpec extends ObjectBehavior @@ -35,7 +36,17 @@ final class TwigTemplateBlockRendererSpec extends ObjectBehavior function it_is_a_template_block_renderer(): void { - $this->shouldImplement(TemplateBlockRendererInterface::class); + $this->shouldImplement(BlockRendererInterface::class); + } + + function it_throws_an_exception_when_trying_to_render_unsupported_block(): void + { + $templateBlock = new ComponentBlock('block_name', 'event_name', 'Component', [], [], 0, true); + + $this + ->shouldThrow(\InvalidArgumentException::class) + ->during('render', [$templateBlock]) + ; } function it_renders_a_template_block( From 31f6005ea59fffb134f885a9ca3dea237e6f686f Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Wed, 4 Oct 2023 15:12:40 +0200 Subject: [PATCH 034/166] Implement the Dashboard view --- .../Resources/assets/entrypoint.js | 2 +- .../{apexcharts.js => statistics_chart.js} | 24 ++++----- .../config/app/template_events/dashboard.yaml | 49 +++++++++++++++++++ .../config/services/twig_component.xml | 17 ++++++- .../Index/Component/newCustomers.html.twig | 42 ++++++++++++++++ .../Index/Component/newOrders.html.twig | 46 +++++++++++++++++ .../Index/Component/statistics.html.twig | 5 ++ .../Header/TitleBlock/_title.html.twig | 7 +++ .../_averageOrderValue.html.twig | 19 +++++++ .../StatisticsGrid/_customers.html.twig | 19 +++++++ .../StatisticsGrid/_paidOrders.html.twig | 19 +++++++ .../Content/StatisticsGrid/_sales.html.twig | 19 +++++++ .../Index/Content/_latestStatistics.html.twig | 7 +++ .../Index/Content/_statisticsChart.html.twig | 7 +++ .../Index/Content/_statisticsGrid.html.twig | 5 ++ .../Resources/views/Dashboard/index.html.twig | 13 +++-- .../Content/Header/_titleBlock.html.twig | 4 +- .../Shared/Crud/Common/_content.html.twig | 4 +- .../Dashboard/NewCustomersComponent.php | 42 ++++++++++++++++ .../Dashboard/NewOrdersComponent.php | 42 ++++++++++++++++ .../Dashboard/StatisticsComponent.php | 47 ++++++++++++++++++ ...Dropdown.php => UserDropdownComponent.php} | 4 +- symfony.lock | 3 -- 23 files changed, 421 insertions(+), 25 deletions(-) rename src/Sylius/Bundle/AdminBundle/Resources/assets/scripts/{apexcharts.js => statistics_chart.js} (78%) create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/dashboard.yaml create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Component/newCustomers.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Component/newOrders.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Component/statistics.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Content/Header/TitleBlock/_title.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Content/StatisticsGrid/_averageOrderValue.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Content/StatisticsGrid/_customers.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Content/StatisticsGrid/_paidOrders.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Content/StatisticsGrid/_sales.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Content/_latestStatistics.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Content/_statisticsChart.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Content/_statisticsGrid.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/TwigComponent/Dashboard/NewCustomersComponent.php create mode 100644 src/Sylius/Bundle/AdminBundle/TwigComponent/Dashboard/NewOrdersComponent.php create mode 100644 src/Sylius/Bundle/AdminBundle/TwigComponent/Dashboard/StatisticsComponent.php rename src/Sylius/Bundle/AdminBundle/TwigComponent/Shared/Navbar/{UserDropdown.php => UserDropdownComponent.php} (97%) diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/entrypoint.js b/src/Sylius/Bundle/AdminBundle/Resources/assets/entrypoint.js index c754186da1..8203216c06 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/assets/entrypoint.js +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/entrypoint.js @@ -9,8 +9,8 @@ import './styles/main.scss'; -import './scripts/apexcharts'; import './scripts/choices'; +import './scripts/statistics_chart'; import 'bootstrap'; diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/scripts/apexcharts.js b/src/Sylius/Bundle/AdminBundle/Resources/assets/scripts/statistics_chart.js similarity index 78% rename from src/Sylius/Bundle/AdminBundle/Resources/assets/scripts/apexcharts.js rename to src/Sylius/Bundle/AdminBundle/Resources/assets/scripts/statistics_chart.js index fe7bea214d..720e95692f 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/assets/scripts/apexcharts.js +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/scripts/statistics_chart.js @@ -10,10 +10,17 @@ import ApexCharts from 'apexcharts'; (function () { + // eslint-disable-next-line no-undef + const statisticsChart = document.querySelector('#statistics-chart'); + + if (!statisticsChart) { + return; + } + const options = { series: [{ - name: 'Inflation', - data: [2.3, 3.1, 4.0, 10.1, 4.0, 3.6, 3.2, 2.3, 1.4, 0.8, 0.5, 0.2], + name: 'Sales', + data: JSON.parse(statisticsChart.dataset.sales), }], chart: { height: 350, @@ -30,7 +37,7 @@ import ApexCharts from 'apexcharts'; dataLabels: { enabled: true, formatter(val) { - return `${val}%`; + return `${val}`; }, offsetY: -20, style: { @@ -40,7 +47,7 @@ import ApexCharts from 'apexcharts'; }, xaxis: { - categories: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'], + categories: JSON.parse(statisticsChart.dataset.intervals), position: 'top', axisBorder: { show: false, @@ -89,11 +96,6 @@ import ApexCharts from 'apexcharts'; }, }; - // eslint-disable-next-line no-undef - const ch = document.querySelector('#chart-demo'); - if (ch) { - // eslint-disable-next-line no-undef - const chart = new ApexCharts(document.querySelector('#chart-demo'), options); - chart.render(); - } + const chart = new ApexCharts(statisticsChart, options); + chart.render(); }()); diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/dashboard.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/dashboard.yaml new file mode 100644 index 0000000000..6a129da892 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/dashboard.yaml @@ -0,0 +1,49 @@ +sylius_ui: + events: + sylius.admin.dashboard: + blocks: + sidebar: + template: '@SyliusAdmin/Shared/Crud/Common/_sidebar.html.twig' + navbar: + template: '@SyliusAdmin/Shared/Crud/Common/_navbar.html.twig' + content: + template: '@SyliusAdmin/Shared/Crud/Common/_content.html.twig' + sylius.admin.dashboard.content: + blocks: + header: + template: '@SyliusAdmin/Shared/Crud/Common/Content/_header.html.twig' + statistics: + component: + name: 'SyliusAdmin.Dashboard.Statistics' + inputs: + context: 'expr:context' + channel: 'expr:context["channel"]' + latest_statistics: '@SyliusAdmin/Dashboard/Index/Content/_latestStatistics.html.twig' + sylius.admin.dashboard.content.header: + blocks: + title_block: + template: '@SyliusAdmin/Shared/Crud/Common/Content/Header/_titleBlock.html.twig' + sylius.admin.dashboard.content.header.title_block: + blocks: + title: + template: '@SyliusAdmin/Dashboard/Index/Content/Header/TitleBlock/_title.html.twig' + context: + header: sylius.ui.dashboard + sylius.admin.dashboard.content.statistics: + blocks: + statistics_grid: + template: '@SyliusAdmin/Dashboard/Index/Content/_statisticsGrid.html.twig' + statistics_chart: + template: '@SyliusAdmin/Dashboard/Index/Content/_statisticsChart.html.twig' + sylius.admin.dashboard.content.statistics.grid: + blocks: + sales: '@SyliusAdmin/Dashboard/Index/Content/StatisticsGrid/_sales.html.twig' + paid_orders: '@SyliusAdmin/Dashboard/Index/Content/StatisticsGrid/_paidOrders.html.twig' + customers: '@SyliusAdmin/Dashboard/Index/Content/StatisticsGrid/_customers.html.twig' + average_order_value: '@SyliusAdmin/Dashboard/Index/Content/StatisticsGrid/_averageOrderValue.html.twig' + sylius.admin.dashboard.content.latest_statistics: + blocks: + new_customers: + component: 'SyliusAdmin.Dashboard.NewCustomers' + new_orders: + component: 'SyliusAdmin.Dashboard.NewOrders' diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/services/twig_component.xml b/src/Sylius/Bundle/AdminBundle/Resources/config/services/twig_component.xml index 0913d645c0..f759f23a04 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/services/twig_component.xml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/services/twig_component.xml @@ -11,11 +11,26 @@ + + + + + + + + + + + + + + + - + diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Component/newCustomers.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Component/newCustomers.html.twig new file mode 100644 index 0000000000..a68b26f97e --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Component/newCustomers.html.twig @@ -0,0 +1,42 @@ +
      +
      +
      +

      {{ 'sylius.ui.new_customers'|trans }}

      +
      +
      +
      - +
      {{ sylius_grid_render_field(grid, field, row) }}
      Origin eventNameTemplateTypePath Duration Priority
      {{ block.definition.eventName }}{{ block.definition.name }}{{ block.definition.template }}{{ block.definition.component != null ? 'Component' : 'Template' }}{{ block.definition.component ?? block.definition.template }} {{ '%.0f'|format(block.time * 1000) }}ms {{ block.definition.priority }}
      + + + + + + + + {% for customer in newCustomers %} + + + + + {% endfor %} + + + + + + +
      Customer
      +
      +
      + + {{ customer.firstName|first }}{{ customer.lastName|first }} + +
      +
      +
      {{ customer.firstName }} {{ customer.lastName }}
      +
      {{ customer.email }}
      +
      +
      +       		{{ 'sylius.ui.show'|trans }}
      {{ 'sylius.ui.show_all'|trans }}
      +
      +
      + diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Component/newOrders.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Component/newOrders.html.twig new file mode 100644 index 0000000000..593da087d6 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Component/newOrders.html.twig @@ -0,0 +1,46 @@ +
      +
      +
      +

      {{ 'sylius.ui.new_orders'|trans }}

      +
      +
      + + + + + + + + + + + {% for order in newOrders %} + + + + + + + {% endfor %} + + + + + + +
      {{ 'sylius.ui.customer'|trans }}{{ 'sylius.ui.items'|trans }}{{ 'sylius.ui.total'|trans }}
      +
      +
      + + {{ order.customer.firstName|first }}{{ order.customer.lastName|first }} + +
      +
      +
      {{ order.customer.firstName }} {{ order.customer.lastName }}
      +
      {{ order.customer.email }}
      +
      +
      +       		{{ order.items|length }}{{ order.total|sylius_format_money(order.currencyCode, order.localeCode) }}{{ 'sylius.ui.show'|trans }}
      {{ 'sylius.ui.show_all'|trans }}
      +
      +
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Component/statistics.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Component/statistics.html.twig new file mode 100644 index 0000000000..897f238316 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Component/statistics.html.twig @@ -0,0 +1,5 @@ +{% set main_event = twig_event_name(context.main_event, 'statistics') %} + +
      + {{ twig_event(main_event, context|merge({ main_event: main_event })) }} +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Content/Header/TitleBlock/_title.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Content/Header/TitleBlock/_title.html.twig new file mode 100644 index 0000000000..cdf4bba1b0 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Content/Header/TitleBlock/_title.html.twig @@ -0,0 +1,7 @@ +{% import '@SyliusAdmin/Shared/Helper/header.html.twig' as _header %} + +
      +
      + {{ _header.h1('sylius.ui.dashboard'|trans) }} +
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Content/StatisticsGrid/_averageOrderValue.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Content/StatisticsGrid/_averageOrderValue.html.twig new file mode 100644 index 0000000000..63c11475d2 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Content/StatisticsGrid/_averageOrderValue.html.twig @@ -0,0 +1,19 @@ +{% from '@SyliusAdmin/Shared/Helper/icon.html.twig' import icon as _icon %} + +
      +
      +
      +
      +
      + + {{ _icon({ icon: 'slash' }) }} + +
      +
      +
      {{ 'sylius.ui.average_order_value'|trans }}
      +
      {{ _context.statistics.average_order_value }}
      +
      +
      +
      +
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Content/StatisticsGrid/_customers.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Content/StatisticsGrid/_customers.html.twig new file mode 100644 index 0000000000..74b7ea7c10 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Content/StatisticsGrid/_customers.html.twig @@ -0,0 +1,19 @@ +{% from '@SyliusAdmin/Shared/Helper/icon.html.twig' import icon as _icon %} + +
      +
      +
      +
      +
      + + {{ _icon({ icon: 'users' }) }} + +
      +
      +
      {{ 'sylius.ui.customers'|trans }}
      +
      {{ _context.statistics.number_of_new_customers }}
      +
      +
      +
      +
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Content/StatisticsGrid/_paidOrders.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Content/StatisticsGrid/_paidOrders.html.twig new file mode 100644 index 0000000000..f0f017d5cf --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Content/StatisticsGrid/_paidOrders.html.twig @@ -0,0 +1,19 @@ +{% from '@SyliusAdmin/Shared/Helper/icon.html.twig' import icon as _icon %} + +
      +
      +
      +
      +
      + + {{ _icon({ icon: 'shopping-bag' }) }} + +
      +
      +
      {{ 'sylius.ui.paid_orders'|trans }}
      +
      {{ _context.statistics.number_of_new_orders }}
      +
      +
      +
      +
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Content/StatisticsGrid/_sales.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Content/StatisticsGrid/_sales.html.twig new file mode 100644 index 0000000000..2cfd7b99fe --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Content/StatisticsGrid/_sales.html.twig @@ -0,0 +1,19 @@ +{% from '@SyliusAdmin/Shared/Helper/icon.html.twig' import icon as _icon %} + +
      +
      +
      +
      +
      + + {{ _icon({ icon: 'coins' }) }} + +
      +
      +
      {{ 'sylius.ui.sales'|trans }}
      +
      {{ _context.statistics.total_sales }}
      +
      +
      +
      +
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Content/_latestStatistics.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Content/_latestStatistics.html.twig new file mode 100644 index 0000000000..a2176be349 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Content/_latestStatistics.html.twig @@ -0,0 +1,7 @@ +{% set main_event = twig_event_name(_context.main_event, 'latest_statistics') %} + +
      +
      + {{ twig_event(main_event, _context|merge({ main_event: main_event })) }} +
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Content/_statisticsChart.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Content/_statisticsChart.html.twig new file mode 100644 index 0000000000..92bc4b640b --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Content/_statisticsChart.html.twig @@ -0,0 +1,7 @@ +
      +
      +
      +
      +
      +
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Content/_statisticsGrid.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Content/_statisticsGrid.html.twig new file mode 100644 index 0000000000..a0aec71880 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/Index/Content/_statisticsGrid.html.twig @@ -0,0 +1,5 @@ +{% set main_event = twig_event_name(_context.main_event, 'grid') %} + +
      + {{ twig_event(main_event, _context|merge({ main_event: main_event })) }} +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/index.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/index.html.twig index 51d754e552..2dc3f53823 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/index.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/index.html.twig @@ -1,7 +1,14 @@ -{% extends '@SyliusAdmin/layout.html.twig' %} +{% extends '@SyliusAdmin/Shared/Layout/base.html.twig' %} + +{% set main_event = 'sylius.admin.dashboard' %} {% block title %}{{ 'sylius.ui.dashboard'|trans }} {{ parent() }}{% endblock %} -{% block content %} - {{ sylius_template_event('sylius.admin.dashboard.content', _context) }} +{% block body %} + {{ sylius_template_event( + [main_event], + _context|merge({ + main_event: main_event, + }) + ) }} {% endblock %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/Header/_titleBlock.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/Header/_titleBlock.html.twig index 121ee9e882..061bf0d083 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/Header/_titleBlock.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/Header/_titleBlock.html.twig @@ -1,5 +1,5 @@ -{% set main_event = _context.main_event ~ '.title_block' %} -{% set fallback_event = _context.fallback_event ~ '.title_block' %} +{% set main_event = twig_event_name(_context.main_event, 'title_block') %} +{% set fallback_event = twig_event_name(_context.fallback_event|default(null), 'title_block') %}
      {{ twig_event( diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_content.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_content.html.twig index 0c66c640ca..c4be76beab 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_content.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/_content.html.twig @@ -1,5 +1,5 @@ -{% set main_event = _context.main_event ~ '.content' %} -{% set fallback_event = _context.fallback_event ~ '.content' %} +{% set main_event = twig_event_name(_context.main_event, 'content') %} +{% set fallback_event = twig_event_name(_context.fallback_event|default(null), 'content') %}
      {{ twig_event( diff --git a/src/Sylius/Bundle/AdminBundle/TwigComponent/Dashboard/NewCustomersComponent.php b/src/Sylius/Bundle/AdminBundle/TwigComponent/Dashboard/NewCustomersComponent.php new file mode 100644 index 0000000000..7dca868374 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/TwigComponent/Dashboard/NewCustomersComponent.php @@ -0,0 +1,42 @@ + $customerRepository + */ + public function __construct ( + private readonly CustomerRepositoryInterface $customerRepository, + ) { + } + + /** + * @return array + */ + #[ExposeInTemplate] + public function getNewCustomers(): array + { + return $this->customerRepository->findLatest($this->limit); + } +} diff --git a/src/Sylius/Bundle/AdminBundle/TwigComponent/Dashboard/NewOrdersComponent.php b/src/Sylius/Bundle/AdminBundle/TwigComponent/Dashboard/NewOrdersComponent.php new file mode 100644 index 0000000000..605dd0f732 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/TwigComponent/Dashboard/NewOrdersComponent.php @@ -0,0 +1,42 @@ + $orderRepository + */ + public function __construct ( + private readonly OrderRepositoryInterface $orderRepository, + ) { + } + + /** + * @return array + */ + #[ExposeInTemplate] + public function getNewOrders(): array + { + return $this->orderRepository->findLatest($this->limit); + } +} diff --git a/src/Sylius/Bundle/AdminBundle/TwigComponent/Dashboard/StatisticsComponent.php b/src/Sylius/Bundle/AdminBundle/TwigComponent/Dashboard/StatisticsComponent.php new file mode 100644 index 0000000000..68415180e1 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/TwigComponent/Dashboard/StatisticsComponent.php @@ -0,0 +1,47 @@ + */ + public array $context; + + public ChannelInterface $channel; + + public function __construct ( + private readonly StatisticsDataProviderInterface $statisticsDataProvider, + ) { + } + + #[ExposeInTemplate] + public function getContext(): array + { + return array_merge( + $this->context, + [ + ...$this->statisticsDataProvider->getRawData( + $this->channel, + new \DateTime('-30 days'), + new \DateTime(), + 'day', + ), + ] + ); + } +} diff --git a/src/Sylius/Bundle/AdminBundle/TwigComponent/Shared/Navbar/UserDropdown.php b/src/Sylius/Bundle/AdminBundle/TwigComponent/Shared/Navbar/UserDropdownComponent.php similarity index 97% rename from src/Sylius/Bundle/AdminBundle/TwigComponent/Shared/Navbar/UserDropdown.php rename to src/Sylius/Bundle/AdminBundle/TwigComponent/Shared/Navbar/UserDropdownComponent.php index bfdc04ff4e..6997fed555 100644 --- a/src/Sylius/Bundle/AdminBundle/TwigComponent/Shared/Navbar/UserDropdown.php +++ b/src/Sylius/Bundle/AdminBundle/TwigComponent/Shared/Navbar/UserDropdownComponent.php @@ -14,12 +14,12 @@ declare(strict_types=1); namespace Sylius\Bundle\AdminBundle\TwigComponent\Shared\Navbar; use Sylius\Component\User\Model\UserInterface; -use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; +use Symfony\Component\Security\Core\Security; use Symfony\Contracts\Translation\TranslatorInterface; use Symfony\UX\TwigComponent\Attribute\ExposeInTemplate; -final class UserDropdown +final class UserDropdownComponent { public function __construct ( private UrlGeneratorInterface $urlGenerator, diff --git a/symfony.lock b/symfony.lock index 8b30d00909..029d67c372 100644 --- a/symfony.lock +++ b/symfony.lock @@ -556,9 +556,6 @@ "squizlabs/php_codesniffer": { "version": "3.3.1" }, - "stella-maris/clock": { - "version": "0.1.4" - }, "stof/doctrine-extensions-bundle": { "version": "1.2", "recipe": { From c78e34371a0905b8fe6dc6c50a7e8294133dbc09 Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Wed, 4 Oct 2023 15:13:00 +0200 Subject: [PATCH 035/166] Fix Sylius Template Events --- .../UiBundle/Renderer/TwigComponentBlockRenderer.php | 2 +- .../views/DataCollector/templateBlock.html.twig | 2 +- .../Bundle/UiBundle/Twig/TemplateEventExtension.php | 12 ++++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/Sylius/Bundle/UiBundle/Renderer/TwigComponentBlockRenderer.php b/src/Sylius/Bundle/UiBundle/Renderer/TwigComponentBlockRenderer.php index 99034e67ca..7fd6b35579 100644 --- a/src/Sylius/Bundle/UiBundle/Renderer/TwigComponentBlockRenderer.php +++ b/src/Sylius/Bundle/UiBundle/Renderer/TwigComponentBlockRenderer.php @@ -54,7 +54,7 @@ final class TwigComponentBlockRenderer implements SupportableBlockRendererInterf return $value; } - return $this->expressionLanguage->evaluate(substr($value, 5), $context); + return $this->expressionLanguage->evaluate(substr($value, 5), ['context' => $context]); }, $templateBlock->getComponentInputs()); return $this->componentRenderer->createAndRender($templateBlock->getComponentName(), $inputs); diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/DataCollector/templateBlock.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/DataCollector/templateBlock.html.twig index e2a6da0c42..32eb3d3a90 100644 --- a/src/Sylius/Bundle/UiBundle/Resources/views/DataCollector/templateBlock.html.twig +++ b/src/Sylius/Bundle/UiBundle/Resources/views/DataCollector/templateBlock.html.twig @@ -89,7 +89,7 @@ {% if event.names|length > 1 %}{{ block.definition.eventName }}{% endif %} {{ block.definition.name }} - {{ block.definition.component != null ? 'Component' : 'Template' }} + {{ block.definition.component != [] ? 'Component' : 'Template' }} {{ block.definition.component ?? block.definition.template }} {{ '%.0f'|format(block.time * 1000) }}ms {{ block.definition.priority }} diff --git a/src/Sylius/Bundle/UiBundle/Twig/TemplateEventExtension.php b/src/Sylius/Bundle/UiBundle/Twig/TemplateEventExtension.php index 62ca90b8e4..e5501e2fd8 100644 --- a/src/Sylius/Bundle/UiBundle/Twig/TemplateEventExtension.php +++ b/src/Sylius/Bundle/UiBundle/Twig/TemplateEventExtension.php @@ -29,6 +29,7 @@ final class TemplateEventExtension extends AbstractExtension return [ new TwigFunction('sylius_template_event', [$this, 'render'], ['is_safe' => ['html']]), new TwigFunction('twig_event', [$this, 'render'], ['is_safe' => ['html']]), + new TwigFunction('twig_event_name', [$this, 'createEventName']), ]; } @@ -42,6 +43,17 @@ final class TemplateEventExtension extends AbstractExtension } Assert::notEmpty($eventName); + $eventName = array_filter($eventName, fn (?string $eventName) => $eventName !== null); + return $this->templateEventRenderer->render($eventName, $context); } + + public function createEventName(?string $eventName, string ...$suffixes): ?string + { + if ($eventName === null) { + return null; + } + + return implode('.', array_merge([$eventName], $suffixes)); + } } From c3e6497ba85bce41d1edfc1393a1757340e2164e Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Thu, 5 Oct 2023 13:33:31 +0200 Subject: [PATCH 036/166] Add pagination --- .../Resources/translations/messages.en.yml | 2 + .../Index/Content/Grid/_dataTable.html.twig | 10 +++- .../views/Shared/Helper/pagination.html.twig | 14 ++++- .../views/Shared/pagerfanta.html.twig | 59 +++++++++++++++++++ 4 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/pagerfanta.html.twig diff --git a/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.en.yml b/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.en.yml index 271c0171f3..3caa9f47fa 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.en.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.en.yml @@ -73,6 +73,8 @@ sylius: no_results: No results found no_results_adjust_your_search: 'Adjust your search and try again.' original_price_details: Original price - this is the price of the product variant It is displayed as crossed-out in the catalog. It is used as the base for current price calculations. If this value is not defined, Catalog Promotion logic will copy value from Price to Original Price. + pagination: + number_of_results: 'Showing %from% to %to% of %total% entries' price_details: Price - this is the current price of the product variant displayed in the catalog. It can be modified explicitly by i.e. catalog promotions. price_history: Price history product: diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/_dataTable.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/_dataTable.html.twig index baf118c568..6f8c67eeb0 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/_dataTable.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Index/Content/Grid/_dataTable.html.twig @@ -17,7 +17,7 @@
      {% endif %}
      - {{ _pagination.perPage(data, definition.limits) }} + {{ _pagination.numberOfResultsSelector(data, definition.limits) }}
      @@ -35,5 +35,13 @@ +
      +
      + {{ _pagination.resultsCount(data) }} +
      +
      + {{ _pagination.simple(data) }} +
      +
      {% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/pagination.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/pagination.html.twig index 93e44634cf..1d03cd5b7b 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/pagination.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/pagination.html.twig @@ -1,4 +1,16 @@ -{% macro perPage(paginator, paginationLimits) %} +{% macro simple(paginator) %} + {{ pagerfanta(paginator, 'twig', options|default({'template': '@SyliusAdmin/Shared/pagerfanta.html.twig'})) }} +{% endmacro %} + +{% macro resultsCount(paginator) %} + {% set from = 1 + (paginator.currentPage - 1) * paginator.maxPerPage %} + {% set to = paginator.maxPerPage + (paginator.currentPage - 1) * paginator.maxPerPage %} + {% set to = to < paginator.nbResults ? to : paginator.nbResults %} + + {{ 'sylius.ui.pagination.number_of_results'|trans({'%from%': from, '%to%': to, '%total%': paginator.nbResults}) }} +{% endmacro %} + +{% macro numberOfResultsSelector(paginator, paginationLimits) %}
      -{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/AdminUser/Form/_content.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/AdminUser/Form/_content.html.twig deleted file mode 100644 index 81d3d430b1..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/AdminUser/Form/_content.html.twig +++ /dev/null @@ -1,7 +0,0 @@ -{% form_theme form '@SyliusUi/Form/imagesTheme.html.twig' %} - -
      - {{ form_errors(form) }} - - {{ sylius_template_event('sylius.admin.admin_user.form.columns', _context) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/AdminUser/Form/_firstColumn.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/AdminUser/Form/_firstColumn.html.twig deleted file mode 100644 index fe60219f0d..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/AdminUser/Form/_firstColumn.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -
      - {{ sylius_template_event('sylius.admin.admin_user.form.first_column', _context) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/AdminUser/Form/_generalInfo.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/AdminUser/Form/_generalInfo.html.twig deleted file mode 100644 index 364a72bfa5..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/AdminUser/Form/_generalInfo.html.twig +++ /dev/null @@ -1,7 +0,0 @@ -
      -

      {{ 'sylius.ui.general_info'|trans }}

      -
      - {{ form_row(form.username) }} - {{ form_row(form.email) }} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/AdminUser/Form/_generalInfoExtended.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/AdminUser/Form/_generalInfoExtended.html.twig deleted file mode 100644 index 704f2177c0..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/AdminUser/Form/_generalInfoExtended.html.twig +++ /dev/null @@ -1,4 +0,0 @@ -
      - {{ form_row(form.plainPassword) }} - {{ form_row(form.enabled) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/AdminUser/Form/_personals.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/AdminUser/Form/_personals.html.twig deleted file mode 100644 index c321dff625..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/AdminUser/Form/_personals.html.twig +++ /dev/null @@ -1,4 +0,0 @@ -
      - {{ form_row(form.firstName) }} - {{ form_row(form.lastName) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/AdminUser/Form/_preferences.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/AdminUser/Form/_preferences.html.twig deleted file mode 100644 index f1c25af9ab..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/AdminUser/Form/_preferences.html.twig +++ /dev/null @@ -1,4 +0,0 @@ -
      -

      {{ 'sylius.ui.preferences'|trans }}

      - {{ form_row(form.localeCode) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/AdminUser/Form/_secondColumn.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/AdminUser/Form/_secondColumn.html.twig deleted file mode 100644 index fa67c84aeb..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/AdminUser/Form/_secondColumn.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -
      - {{ sylius_template_event('sylius.admin.admin_user.form.second_column', _context) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/AdminUser/_avatarImage.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/AdminUser/_avatarImage.html.twig deleted file mode 100644 index f5d50f4277..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/AdminUser/_avatarImage.html.twig +++ /dev/null @@ -1,6 +0,0 @@ -{% if app.user.avatar is not empty and app.user.avatar.path is not empty %} - {% set path = app.user.avatar.path|imagine_filter('sylius_admin_admin_user_avatar_thumbnail') %} - -{% else %} - -{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/AdminUser/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/AdminUser/_form.html.twig deleted file mode 100644 index d0ff62ce49..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/AdminUser/_form.html.twig +++ /dev/null @@ -1 +0,0 @@ -{{ sylius_template_event('sylius.admin.admin_user.form', _context) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/ProductVariant/Index/Header/_breadcrumb.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/ProductVariant/Index/Header/_breadcrumb.html.twig deleted file mode 100644 index bad16c287b..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/ProductVariant/Index/Header/_breadcrumb.html.twig +++ /dev/null @@ -1,10 +0,0 @@ -{% import '@SyliusAdmin/Macro/breadcrumb.html.twig' as breadcrumb %} - -{% set breadcrumbs = [ - { label: 'sylius.ui.administration'|trans, url: path('sylius_admin_dashboard') }, - { label: 'sylius.ui.catalog_promotions'|trans, url: path('sylius_admin_catalog_promotion_index') }, - { label: catalog_promotion.name|default(catalog_promotion.code), url: path('sylius_admin_catalog_promotion_update', {'id': catalog_promotion.id}) }, - { label: 'sylius.ui.variants'|trans }, -] %} - -{{ breadcrumb.crumble(breadcrumbs) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/ProductVariant/Index/Header/_content.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/ProductVariant/Index/Header/_content.html.twig deleted file mode 100644 index cf894b99cd..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/ProductVariant/Index/Header/_content.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% import '@SyliusUi/Macro/headers.html.twig' as headers %} - -{{ headers.default(catalog_promotion.name, configuration.vars.icon|default('bookmark'), configuration.vars.subheader|default('sylius.ui.manage_discounts_on_product_catalog')|trans) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/ProductVariant/Index/_catalogPromotionHeader.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/ProductVariant/Index/_catalogPromotionHeader.html.twig deleted file mode 100644 index ed7361c47d..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/ProductVariant/Index/_catalogPromotionHeader.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -
      - {{ sylius_template_event('sylius.admin.catalog_promotion.product_variant.index.header.content', _context) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/ProductVariant/Index/_header.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/ProductVariant/Index/_header.html.twig deleted file mode 100644 index e001359e08..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/ProductVariant/Index/_header.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -{{ render(url('sylius_admin_partial_catalog_promotion_show', { - 'id': app.request.attributes.get('id'), - 'template': '@SyliusAdmin/CatalogPromotion/ProductVariant/Index/_catalogPromotionHeader.html.twig', - 'vars': configuration.vars -})) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/ProductVariant/Index/_headerWidget.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/ProductVariant/Index/_headerWidget.html.twig deleted file mode 100644 index 2e3d9407ae..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/ProductVariant/Index/_headerWidget.html.twig +++ /dev/null @@ -1,4 +0,0 @@ -
      - {% include '@SyliusAdmin/CatalogPromotion/ProductVariant/Index/_header.html.twig' %} - {% include '@SyliusAdmin/Crud/Index/_actions.html.twig' %} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/ProductVariant/index.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/ProductVariant/index.html.twig deleted file mode 100644 index 38ae7687bb..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/ProductVariant/index.html.twig +++ /dev/null @@ -1,14 +0,0 @@ -{% extends '@SyliusAdmin/layout.html.twig' %} - -{% import '@SyliusUi/Macro/headers.html.twig' as headers %} - -{% set definition = resources.definition %} -{% set data = resources.data %} - -{% set header = configuration.vars.header|default(metadata.applicationName~'.ui.'~metadata.pluralName) %} - -{% block title %}{{ header|trans }} {{ parent() }}{% endblock %} - -{% block content %} - {{ sylius_template_event('sylius.admin.catalog_promotion.product_variant.index.content', _context) }} -{% endblock %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Scope/default.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Scope/default.html.twig deleted file mode 100644 index 196a5f9488..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Scope/default.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% include '@SyliusAdmin/CatalogPromotion/Scope/for_products.html.twig' %} - -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Scope/for_products.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Scope/for_products.html.twig deleted file mode 100644 index 83e2dd4eb6..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Scope/for_products.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -{% form_theme field '@SyliusAdmin/Form/theme.html.twig' %} - -{{ form_row(field.products, {'remote_url': path('sylius_admin_ajax_product_by_name_phrase'), 'load_edit_url': path('sylius_admin_ajax_product_by_code')}) }} - -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Scope/for_taxons.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Scope/for_taxons.html.twig deleted file mode 100644 index 2db29fed62..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Scope/for_taxons.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -{% form_theme field '@SyliusAdmin/Form/theme.html.twig' %} - -{{ form_row(field.taxons, {'remote_url': path('sylius_admin_ajax_taxon_by_name_phrase'), 'load_edit_url': path('sylius_admin_ajax_taxon_by_code')}) }} - -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Scope/for_variants.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Scope/for_variants.html.twig deleted file mode 100644 index 7f54396aa6..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Scope/for_variants.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -{% form_theme field '@SyliusAdmin/Form/theme.html.twig' %} - -{{ form_row(field.variants, {'remote_url': path('sylius_admin_ajax_all_product_variants_by_phrase'), 'remote_criteria_type': 'contains', 'remote_criteria_name': 'phrase', 'load_edit_url': path('sylius_admin_ajax_all_product_variants_by_codes')}) }} - -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/Action/fixed_discount.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/Action/fixed_discount.html.twig deleted file mode 100644 index 7fca1f0f65..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/Action/fixed_discount.html.twig +++ /dev/null @@ -1,19 +0,0 @@ -{% import "@SyliusAdmin/Common/Macro/money.html.twig" as money %} - - - - - - - - {% set currencies = sylius_channels_currencies() %} - {% for channelCode, channelConfiguration in action.configuration %} - - - - - {% endfor %} - -
      {{ 'sylius.ui.type'|trans }}{{ 'sylius.ui.fixed_discount'|trans }}
      {{ channelCode }} - {{ money.format(channelConfiguration.amount, currencies[channelCode]) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/Action/percentage_discount.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/Action/percentage_discount.html.twig deleted file mode 100644 index d7105e8f4d..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/Action/percentage_discount.html.twig +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - -
      {{ 'sylius.ui.type'|trans }}{{ 'sylius.ui.percentage_discount'|trans }}
      {{ 'sylius.ui.amount'|trans }} - {{ action.configuration.amount|format_number(style='percent') }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/Scope/for_products.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/Scope/for_products.html.twig deleted file mode 100644 index 47459aa9d9..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/Scope/for_products.html.twig +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - -
      {{ 'sylius.ui.type'|trans }}{{ 'sylius.ui.for_products'|trans }}
      {{ 'sylius.ui.products'|trans }} -
        - {% for product in scope.configuration.products %} -
      • {{ product }}
        • - {% endfor %} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/Scope/for_taxons.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/Scope/for_taxons.html.twig deleted file mode 100644 index cec0a452d7..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/Scope/for_taxons.html.twig +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - -
      {{ 'sylius.ui.type'|trans }}{{ 'sylius.ui.for_taxons'|trans }}
      {{ 'sylius.ui.taxons'|trans }} -
        - {% for taxon in scope.configuration.taxons %} -
      • {{ taxon }}
        • - {% endfor %} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/Scope/for_variants.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/Scope/for_variants.html.twig deleted file mode 100644 index 52861cbbef..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/Scope/for_variants.html.twig +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - -
      {{ 'sylius.ui.type'|trans }}{{ 'sylius.ui.for_variants'|trans }}
      {{ 'sylius.ui.variants'|trans }} -
        - {% for variant in scope.configuration.variants %} -
      • {{ variant }}
        • - {% endfor %} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/_actions.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/_actions.html.twig deleted file mode 100644 index d66ce48b2e..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/_actions.html.twig +++ /dev/null @@ -1,10 +0,0 @@ - - -

      {{ 'sylius.ui.actions'|trans }}

      -
      -
      - {% for action in catalog_promotion.actions %} - {% include '@SyliusAdmin/CatalogPromotion/Show/Action/' ~ action.type ~ '.html.twig' %} - {% endfor %} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/_breadcrumb.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/_breadcrumb.html.twig deleted file mode 100644 index c9f187ba14..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/_breadcrumb.html.twig +++ /dev/null @@ -1,9 +0,0 @@ -{% import '@SyliusAdmin/Macro/breadcrumb.html.twig' as breadcrumb %} - -{% set breadcrumbs = [ - { label: 'sylius.ui.administration'|trans, url: path('sylius_admin_dashboard') }, - { label: 'sylius.ui.catalog_promotions'|trans, url: path('sylius_admin_catalog_promotion_index') }, - { label: catalog_promotion.name } -] %} - -{{ breadcrumb.crumble(breadcrumbs) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/_content.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/_content.html.twig deleted file mode 100644 index af0f29ce73..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/_content.html.twig +++ /dev/null @@ -1,10 +0,0 @@ -
      -
      -

      {{ 'sylius.ui.details'|trans }}

      - {{ sylius_template_event('sylius.admin.catalog_promotion.show.content.left_bar', _context) }} -
      - -
      - {{ sylius_template_event('sylius.admin.catalog_promotion.show.content.right_bar', _context) }} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/_details.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/_details.html.twig deleted file mode 100644 index 3b03d114cf..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/_details.html.twig +++ /dev/null @@ -1,55 +0,0 @@ -
      -
      - {% if catalog_promotion.enabled %} - {{ 'sylius.ui.enabled'|trans }} - {% else %} - {{ 'sylius.ui.disabled'|trans }} - {% endif %} - - {% if catalog_promotion.exclusive %} - {{ 'sylius.ui.exclusive'|trans }} - {% endif %} - - {% include '@SyliusAdmin/Common/Label/catalogPromotionState.html.twig' with {'data': catalog_promotion.state} %} - - - - - - - - - - - - - {% if catalog_promotion.startDate is not null %} - - - - - {% endif %} - - {% if catalog_promotion.endDate is not null %} - - - - - {% endif %} - - - - - - - - - -
      {{ 'sylius.ui.code'|trans }}{{ catalog_promotion.code }}
      {{ 'sylius.ui.name'|trans }}{{ catalog_promotion.name }}
      {{ 'sylius.ui.start_date'|trans }}{{ catalog_promotion.startDate|format_datetime(pattern='YYYY-MM-dd HH:mm:ss') }}
      {{ 'sylius.ui.end_date'|trans }}{{ catalog_promotion.endDate|format_datetime(pattern='YYYY-MM-dd HH:mm:ss') }}
      {{ 'sylius.ui.priority'|trans }}{{ catalog_promotion.priority }}
      {{ 'sylius.ui.channels'|trans }} - {% for channel in catalog_promotion.channels %} - {% include '@SyliusAdmin/Common/_channel.html.twig' with {'channel': channel} %} -
      - {% endfor %} -
      -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/_header.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/_header.html.twig deleted file mode 100644 index ed752c1767..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/_header.html.twig +++ /dev/null @@ -1,8 +0,0 @@ -
      -

      - -
      - {{ catalog_promotion.name }} -
      -

      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/_headerMenu.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/_headerMenu.html.twig deleted file mode 100644 index 00770464dd..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/_headerMenu.html.twig +++ /dev/null @@ -1,8 +0,0 @@ -
      -
      - - - {{ 'sylius.ui.edit'|trans }} - -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/_headerWidget.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/_headerWidget.html.twig deleted file mode 100644 index 5652cab15a..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/_headerWidget.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -
      - {{ sylius_template_event('sylius.admin.catalog_promotion.show.header.content', _context) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/_scopes.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/_scopes.html.twig deleted file mode 100644 index f23517a1c1..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/_scopes.html.twig +++ /dev/null @@ -1,8 +0,0 @@ -

      {{ 'sylius.ui.scopes'|trans }}

      -
      -
      - {% for scope in catalog_promotion.scopes %} - {% include '@SyliusAdmin/CatalogPromotion/Show/Scope/' ~ scope.type ~ '.html.twig' %} - {% endfor %} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/_translations.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/_translations.html.twig deleted file mode 100644 index 4d825cc95b..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/Show/_translations.html.twig +++ /dev/null @@ -1,26 +0,0 @@ -{% import '@SyliusUi/Macro/flags.html.twig' as flags %} - - - -
      - {% for translation in catalog_promotion.translations %} -
      - - {{ flags.fromLocaleCode(translation.locale) }} {{ translation.locale|sylius_locale_name }} -
      -
      - - - - - - - - - - - -
      {{ 'sylius.ui.label'|trans }}{{ translation.label }}
      {{ 'sylius.ui.description'|trans }}{{ translation.description|nl2br }}
      -
      - {% endfor %} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/_action.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/_action.html.twig deleted file mode 100644 index e9d636bc5a..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/_action.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -{% form_theme field '@SyliusAdmin/Form/theme.html.twig' %} - -{{ form_row(field) }} - -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/_form.html.twig deleted file mode 100644 index 5723343641..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/_form.html.twig +++ /dev/null @@ -1,39 +0,0 @@ -{% from '@SyliusAdmin/Macro/translationForm.html.twig' import translationForm %} - -{% form_theme form '@SyliusAdmin/CatalogPromotion/theme.html.twig' %} - -
      -
      - {{ form_errors(form) }} -
      - {{ form_row(form.code) }} - {{ form_row(form.name) }} -
      - - {{ 'sylius.ui.catalog_promotion.dates_details'|trans }} -
      - {{ form_row(form.startDate) }} - {{ form_row(form.endDate) }} - {{ form_row(form.enabled) }} - {{ form_row(form.priority) }} - {{ form_row(form.exclusive) }} - {{ form_row(form.channels) }} -
      - - -
      -
      - {{ translationForm(form.translations) }} -
      -
      -

      {{ 'sylius.ui.configuration'|trans }}

      -
      -
      - {{ form_row(form.scopes) }} -
      -
      - {{ form_row(form.actions) }} -
      -
      -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/show.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/show.html.twig deleted file mode 100644 index 65303b87b6..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/show.html.twig +++ /dev/null @@ -1,7 +0,0 @@ -{% extends '@SyliusAdmin/layout.html.twig' %} - -{% block title %}{{ 'sylius.ui.catalog_promotion'|trans ~ ' ' ~ catalog_promotion.name }} {{ parent() }}{% endblock %} - -{% block content %} - {{ sylius_template_event('sylius.admin.catalog_promotion.show.content', _context) }} -{% endblock %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/theme.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/theme.html.twig deleted file mode 100644 index afebef46e2..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/CatalogPromotion/theme.html.twig +++ /dev/null @@ -1,10 +0,0 @@ -{% extends '@SyliusAdmin/Form/theme.html.twig' %} - -{% block sylius_catalog_promotion_scope_widget %} - {{ form_row(form.type) }} - {% if form.vars.value != null %} - {% include '@SyliusAdmin/CatalogPromotion/Scope/'~form.vars.value.type~'.html.twig' with {'field': form.configuration} %} - {% else %} - {% include '@SyliusAdmin/CatalogPromotion/Scope/default.html.twig' with {'field': form.configuration} %} - {% endif %} -{% endblock %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Form/_billingData.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Form/_billingData.html.twig deleted file mode 100644 index 0e89fd57a1..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Form/_billingData.html.twig +++ /dev/null @@ -1,15 +0,0 @@ -

      {{ form_label(form.shopBillingData) }}

      -
      -
      - {{ form_row(form.shopBillingData.company) }} - {{ form_row(form.shopBillingData.taxId) }} -
      -
      - {{ form_row(form.shopBillingData.countryCode) }} - {{ form_row(form.shopBillingData.street) }} -
      -
      - {{ form_row(form.shopBillingData.city) }} - {{ form_row(form.shopBillingData.postcode) }} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Form/_content.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Form/_content.html.twig deleted file mode 100644 index 2a70284b48..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Form/_content.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -{{ form_errors(form) }} - -
      - {{ sylius_template_event('sylius.admin.channel.form.content', _context) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Form/_countries.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Form/_countries.html.twig deleted file mode 100644 index a50d69bc46..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Form/_countries.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -
      - {{ form_row(form.countries) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Form/_firstColumn.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Form/_firstColumn.html.twig deleted file mode 100644 index e9ad998f51..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Form/_firstColumn.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -
      - {{ sylius_template_event('sylius.admin.channel.form.first_column_content', _context) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Form/_general.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Form/_general.html.twig deleted file mode 100644 index 3a089b991b..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Form/_general.html.twig +++ /dev/null @@ -1,17 +0,0 @@ -

      {{ 'sylius.ui.general'|trans }}

      -
      - {{ form_errors(form) }} -
      -
      - {{ form_row(form.code) }} -
      -
      - {{ form_row(form.name) }} -
      -
      - {{ form_row(form.color) }} -
      -
      - - {{ form_row(form.enabled) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Form/_generalHost.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Form/_generalHost.html.twig deleted file mode 100644 index 9f517cda93..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Form/_generalHost.html.twig +++ /dev/null @@ -1,13 +0,0 @@ -
      -
      - {{ form_label(form.hostname) }} -
      -
      https://
      - {{ form_widget(form.hostname) }} -
      - {{ form_errors(form.hostname) }} -
      - {{ form_row(form.contactEmail) }} - {{ form_row(form.contactPhoneNumber) }} - {{ form_row(form.description, {'attr': {'rows' : '3'}}) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Form/_lookAndFeel.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Form/_lookAndFeel.html.twig deleted file mode 100644 index aa0d3e4747..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Form/_lookAndFeel.html.twig +++ /dev/null @@ -1,19 +0,0 @@ - -

      {{ 'sylius.ui.look_and_feel'|trans }}

      -
      - {{ form_row(form.themeName) }} -
      -
      - {{ form_row(form.locales) }} - {{ form_row(form.defaultLocale) }} -
      -
      - {{ form_row(form.menuTaxon) }} -
      - -
      - {{ form_row(form.skippingShippingStepAllowed) }} - {{ form_row(form.skippingPaymentStepAllowed) }} - {{ form_row(form.accountVerificationRequired) }} - {{ 'sylius.ui.channel.account_verification_required_details'|trans }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Form/_money.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Form/_money.html.twig deleted file mode 100644 index d812205b74..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Form/_money.html.twig +++ /dev/null @@ -1,12 +0,0 @@ - -

      {{ 'sylius.ui.money'|trans }}

      -
      -
      - {{ form_row(form.baseCurrency) }} - {{ form_row(form.currencies) }} -
      -
      -
      - {{ form_row(form.defaultTaxZone) }} - {{ form_row(form.taxCalculationStrategy) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Form/_priceHistoryConfig.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Form/_priceHistoryConfig.html.twig deleted file mode 100644 index a950b2caf0..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Form/_priceHistoryConfig.html.twig +++ /dev/null @@ -1,7 +0,0 @@ -{% form_theme form '@SyliusAdmin/Form/theme.html.twig' %} - -
      - {{ form_row(form.channelPriceHistoryConfig.lowestPriceForDiscountedProductsVisible) }} - {{ form_row(form.channelPriceHistoryConfig.lowestPriceForDiscountedProductsCheckingPeriod) }} - {{ form_row(form.channelPriceHistoryConfig.taxonsExcludedFromShowingLowestPrice, {'remote_url': path('sylius_admin_ajax_taxon_by_name_phrase'), 'load_edit_url': path('sylius_admin_ajax_taxon_by_code')}) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Form/_secondColumn.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Form/_secondColumn.html.twig deleted file mode 100644 index bbe9c17026..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Form/_secondColumn.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -
      - {{ sylius_template_event('sylius.admin.channel.form.second_column_content', _context) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Form/_shippingAddressInCheckoutRequired.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Form/_shippingAddressInCheckoutRequired.html.twig deleted file mode 100644 index 8c2400228b..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Form/_shippingAddressInCheckoutRequired.html.twig +++ /dev/null @@ -1,18 +0,0 @@ -
      -
      - {{ form_label(form.shippingAddressInCheckoutRequired) }} -
      -
      -
      - -
      -
      -
      - {{ form_widget(form.shippingAddressInCheckoutRequired) }} -
      -
      -
      - -
      -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Grid/Field/code.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Grid/Field/code.html.twig deleted file mode 100644 index 411fb6b59c..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Grid/Field/code.html.twig +++ /dev/null @@ -1 +0,0 @@ -{{ data.code }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Grid/Field/name.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Grid/Field/name.html.twig deleted file mode 100644 index 7341ba10bc..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Grid/Field/name.html.twig +++ /dev/null @@ -1 +0,0 @@ -{% include '@SyliusAdmin/Common/_channel.html.twig' with {'channel': data} %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Grid/Field/themeName.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Grid/Field/themeName.html.twig deleted file mode 100644 index d85ac84333..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/Grid/Field/themeName.html.twig +++ /dev/null @@ -1,4 +0,0 @@ - - - {{ data|default('sylius.ui.default'|trans) }} - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/_form.html.twig deleted file mode 100644 index 6e0ddff07e..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Channel/_form.html.twig +++ /dev/null @@ -1 +0,0 @@ -{{ sylius_template_event('sylius.admin.channel.form', _context) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ChannelPricingLogEntry/Grid/Field/originalPrice.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ChannelPricingLogEntry/Grid/Field/originalPrice.html.twig deleted file mode 100644 index f30b178739..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ChannelPricingLogEntry/Grid/Field/originalPrice.html.twig +++ /dev/null @@ -1,10 +0,0 @@ -{% import "@SyliusAdmin/Common/Macro/money.html.twig" as money %} - -{% set currencies = sylius_channels_currencies() %} -{% set channel_code = data.channelPricing.channelCode %} - -{% if data.originalPrice %} - {{ money.format(data.originalPrice, currencies[channel_code]) }} -{% else %} - - -{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ChannelPricingLogEntry/Grid/Field/price.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ChannelPricingLogEntry/Grid/Field/price.html.twig deleted file mode 100644 index 1e1ae6592c..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ChannelPricingLogEntry/Grid/Field/price.html.twig +++ /dev/null @@ -1,6 +0,0 @@ -{% import "@SyliusAdmin/Common/Macro/money.html.twig" as money %} - -{% set currencies = sylius_channels_currencies() %} -{% set channel_code = data.channelPricing.channelCode %} - -{{ money.format(data.price, currencies[channel_code]) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ChannelPricingLogEntry/Index/_breadcrumb.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ChannelPricingLogEntry/Index/_breadcrumb.html.twig deleted file mode 100644 index 4a0e27e724..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ChannelPricingLogEntry/Index/_breadcrumb.html.twig +++ /dev/null @@ -1,13 +0,0 @@ -{% import '@SyliusAdmin/Macro/breadcrumb.html.twig' as breadcrumb %} - -{% set product_variant = configuration.vars.product_variant %} -{% set product = configuration.vars.product_variant.product %} - -{{ breadcrumb.crumble([ - { label: 'sylius.ui.administration'|trans, url: path('sylius_admin_dashboard') }, - { label: 'sylius.ui.products'|trans, url: path('sylius_admin_product_index') }, - { label: product.name|default(product.code), url: path('sylius_admin_product_show', {'id': product.id }) }, - { label: 'sylius.ui.variants'|trans, url: path('sylius_admin_product_variant_index', {'productId': product.id }) }, - { label: product_variant.name|default(product_variant.code), url: path('sylius_admin_product_variant_update', {'id': product_variant.id, 'productId': product.id }) }, - { label: 'sylius.ui.price_history'|trans }, -]) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Common/Form/_address.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Common/Form/_address.html.twig deleted file mode 100644 index e8b1f37912..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Common/Form/_address.html.twig +++ /dev/null @@ -1,17 +0,0 @@ -
      - {{ form_row(form.firstName) }} - {{ form_row(form.lastName) }} -
      -{{ form_row(form.company) }} -{{ form_row(form.street) }} -{{ form_row(form.countryCode) }} -
      - {% if form.provinceCode is defined %} - {{ form_row(form.provinceCode, {'attr': {'class': 'ui dropdown'}}) }} - {% endif %} -
      -
      - {{ form_row(form.city) }} - {{ form_row(form.postcode) }} -
      -{{ form_row(form.phoneNumber) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Common/Form/_province.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Common/Form/_province.html.twig deleted file mode 100644 index 00e73c51e2..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Common/Form/_province.html.twig +++ /dev/null @@ -1,6 +0,0 @@ -{{ form_label(form) }} -{% if form.vars.choices is defined %} - {{ form_widget(form, {'attr': {'class': 'ui dropdown'}}) }} -{% else %} - {{ form_widget(form) }} -{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Common/Label/catalogPromotionState.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Common/Label/catalogPromotionState.html.twig deleted file mode 100644 index 6cf2c9c6ba..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Common/Label/catalogPromotionState.html.twig +++ /dev/null @@ -1,15 +0,0 @@ -{% - set viewOptions = { - inactive: { icon: 'adjust', color: 'grey' }, - processing: { icon: 'clock', color: 'blue' }, - active: { icon: 'check', color: 'green' }, - failed: { icon: 'ban', color: 'red' }, - } -%} - -{% set value = 'sylius.ui.' ~ data %} - - - - {{ value|trans }} - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Common/Label/paymentState.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Common/Label/paymentState.html.twig deleted file mode 100644 index dfd7adb199..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Common/Label/paymentState.html.twig +++ /dev/null @@ -1,19 +0,0 @@ -{% - set viewOptions = { - authorized: { icon: 'check', color: 'orange' }, - cancelled: { icon: 'ban', color: 'yellow' }, - cart: { icon: 'adjust', color: 'grey' }, - completed: { icon: 'adjust', color: 'green' }, - failed: { icon: 'ban', color: 'red' }, - new: { icon: 'clock', color: 'olive' }, - processing: { icon: 'check', color: 'violet' }, - refunded: { icon: 'reply all', color: 'purple' }, - } -%} - -{% set value = 'sylius.ui.' ~ data %} - - - - {{ value|trans }} - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Common/Label/shipmentState.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Common/Label/shipmentState.html.twig deleted file mode 100644 index a157caeaac..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Common/Label/shipmentState.html.twig +++ /dev/null @@ -1,15 +0,0 @@ -{% - set viewOptions = { - cancelled: { icon: 'ban', color: 'red' }, - cart: { icon: 'adjust', color: 'grey' }, - ready: { icon: 'clock', color: 'blue' }, - shipped: { icon: 'plane', color: 'green' }, - } -%} - -{% set value = 'sylius.ui.' ~ data %} - - - - {{ value|trans }} - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Common/_address.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Common/_address.html.twig deleted file mode 100644 index c9f6801204..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Common/_address.html.twig +++ /dev/null @@ -1,16 +0,0 @@ -{% import "@SyliusUi/Macro/flags.html.twig" as flags %} - -
      - {{ address.firstName }} {{ address.lastName }} - {% if address.company %} - {{ address.company }}
      - {% endif %} - {{ address.phoneNumber }}
      - {{ address.street }}
      - {{ address.city }}
      - {% if address|sylius_province_name is not empty %} - {{ address|sylius_province_name }}
      - {% endif %} - {{ flags.fromCountryCode(address.countryCode) }} - {{ address.countryCode|sylius_country_name|upper }} {{ address.postcode }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Common/_channel.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Common/_channel.html.twig deleted file mode 100644 index e68b752d50..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Common/_channel.html.twig +++ /dev/null @@ -1,9 +0,0 @@ -{% if channel is defined %} -
      - - - - {{ channel.name|default(channel.code) }} - -
      -{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Common/_missingTranslation.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Common/_missingTranslation.html.twig deleted file mode 100644 index 03013a8ba4..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Common/_missingTranslation.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -

      - {{ 'sylius.ui.missing_translation'|trans }} -

      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Country/Grid/Field/name.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Country/Grid/Field/name.html.twig deleted file mode 100644 index a4a33b70a6..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Country/Grid/Field/name.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% import '@SyliusUi/Macro/flags.html.twig' as flags %} - -{{ flags.fromCountryCode(data.code) }} {{ data.code|sylius_country_name }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Country/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Country/_form.html.twig deleted file mode 100644 index f5bc6f57aa..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Country/_form.html.twig +++ /dev/null @@ -1,9 +0,0 @@ -{{ form_errors(form) }} -
      - {{ form_row(form.code) }} - {{ form_row(form.enabled) }} -
      -
      -

      {{ 'sylius.ui.provinces'|trans }}

      - {{ form_row(form.provinces, {'label': false}) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Block/_legacySonataEvent.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Block/_legacySonataEvent.html.twig deleted file mode 100644 index f6debd0f7d..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Block/_legacySonataEvent.html.twig +++ /dev/null @@ -1,4 +0,0 @@ -{{ sonata_block_render_event( - metadata.applicationName ~ '.admin.' ~ metadata.name ~ '.' ~ postfix, - _context|filter((value, key) => key in sonata_block_whitelisted_variables()) -) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Create/_breadcrumb.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Create/_breadcrumb.html.twig deleted file mode 100644 index f77fb7de41..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Create/_breadcrumb.html.twig +++ /dev/null @@ -1,18 +0,0 @@ -{% import '@SyliusAdmin/Macro/breadcrumb.html.twig' as breadcrumb %} - -{% set index_url = path( - configuration.vars.index.route.name|default(configuration.getRouteName('index')), - configuration.vars.index.route.parameters|default(configuration.vars.route.parameters|default({})) - ) -%} - -{% set breadcrumb = configuration.vars.breadcrumb|default(metadata.applicationName~'.ui.'~metadata.pluralName) %} - -{% set breadcrumbs = [ - { label: 'sylius.ui.administration'|trans, url: path('sylius_admin_dashboard') }, - { label: breadcrumb|trans, url: index_url }, - { label: 'sylius.ui.new'|trans } - ] -%} - -{{ breadcrumb.crumble(breadcrumbs) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Create/_content.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Create/_content.html.twig deleted file mode 100644 index ece2d01485..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Create/_content.html.twig +++ /dev/null @@ -1,24 +0,0 @@ -{% set index_url = path( - configuration.vars.index.route.name|default(configuration.getRouteName('index')), - configuration.vars.index.route.parameters|default(configuration.vars.route.parameters|default({})) - ) -%} - -
      - {{ form_start(form, {'action': path(configuration.vars.route.name|default(configuration.getRouteName('create')), configuration.vars.route.parameters|default({})), 'attr': {'class': 'ui loadable form', 'novalidate': 'novalidate'}}) }} - {% include '@SyliusAdmin/Crud/form_validation_errors_checker.html.twig' %} - {% if configuration.vars.templates.form is defined %} - {% include configuration.vars.templates.form %} - {% if not form._token.isRendered %} - {{ form_row(form._token) }} - {% endif %} - {% else %} - {{ form_widget(form) }} - {% endif %} - - {{ sylius_template_event([event_prefix ~ '.form', 'sylius.admin.create.form'], {'metadata': metadata, 'resource': resource, 'form': form}) }} - - {% include '@SyliusUi/Form/Buttons/_create.html.twig' with {'paths': {'cancel': index_url}} %} - - {{ form_end(form, {'render_rest': false}) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Create/_header.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Create/_header.html.twig deleted file mode 100644 index cb0cb2d503..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Create/_header.html.twig +++ /dev/null @@ -1,11 +0,0 @@ -
      -
      - {% include configuration.vars.templates.header_title|default('@SyliusAdmin/Crud/Create/_headerTitle.html.twig') %} - {% include configuration.vars.templates.breadcrumb|default('@SyliusAdmin/Crud/Create/_breadcrumb.html.twig') %} - - {{ sylius_template_event([event_prefix ~ '.header', 'sylius.admin.create.header'], {'metadata': metadata, 'resource': resource}) }} -
      -
      - {% include configuration.vars.templates.toolbar|default('@SyliusAdmin/Crud/_toolbar.html.twig') ignore missing %} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Create/_headerTitle.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Create/_headerTitle.html.twig deleted file mode 100644 index 3466b5e5d6..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Create/_headerTitle.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% import '@SyliusUi/Macro/headers.html.twig' as headers %} - -{{ headers.default(header|trans, configuration.vars.icon|default('plus'), configuration.vars.subheader|default('')|trans) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Index/_actions.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Index/_actions.html.twig deleted file mode 100644 index f3857088e4..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Index/_actions.html.twig +++ /dev/null @@ -1,9 +0,0 @@ -
      -
      - {% if definition.actionGroups.main is defined %} - {% for action in definition.getEnabledActions('main') %} - {{ sylius_grid_render_action(resources, action, null) }} - {% endfor %} - {% endif %} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Index/_breadcrumb.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Index/_breadcrumb.html.twig deleted file mode 100644 index f19316c115..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Index/_breadcrumb.html.twig +++ /dev/null @@ -1,11 +0,0 @@ -{% import '@SyliusAdmin/Macro/breadcrumb.html.twig' as breadcrumb %} - -{% set breadcrumb = configuration.vars.breadcrumb|default(metadata.applicationName~'.ui.'~metadata.pluralName) %} - -{% set breadcrumbs = [ - { label: 'sylius.ui.administration'|trans, url: path('sylius_admin_dashboard') }, - { label: breadcrumb|trans }, - ] -%} - -{{ breadcrumb.crumble(breadcrumbs) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Index/_content.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Index/_content.html.twig deleted file mode 100644 index f470d42685..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Index/_content.html.twig +++ /dev/null @@ -1 +0,0 @@ -{{ sylius_grid_render(resources, '@SyliusAdmin/Grid/_default.html.twig') }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Index/_header.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Index/_header.html.twig deleted file mode 100644 index f05711e570..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Index/_header.html.twig +++ /dev/null @@ -1,10 +0,0 @@ -
      -
      - {% include configuration.vars.templates.header_title|default('@SyliusAdmin/Crud/Index/_headerTitle.html.twig') %} - {% include configuration.vars.templates.breadcrumb|default('@SyliusAdmin/Crud/Index/_breadcrumb.html.twig') %} - - {{ sylius_template_event([event_prefix ~ '.header', 'sylius.admin.index.header'], _context) }} -
      - - {% include '@SyliusAdmin/Crud/Index/_actions.html.twig' %} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Index/_headerTitle.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Index/_headerTitle.html.twig deleted file mode 100644 index 4ad7dfb4bd..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Index/_headerTitle.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% import '@SyliusUi/Macro/headers.html.twig' as headers %} - -{{ headers.default(header|trans, configuration.vars.icon|default('list'), configuration.vars.subheader|default('')|trans) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Update/_breadcrumb.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Update/_breadcrumb.html.twig deleted file mode 100644 index c825f51314..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Update/_breadcrumb.html.twig +++ /dev/null @@ -1,19 +0,0 @@ -{% import '@SyliusAdmin/Macro/breadcrumb.html.twig' as breadcrumb %} - -{% set index_url = path( - configuration.vars.index.route.name|default(configuration.getRouteName('index')), - configuration.vars.index.route.parameters|default(configuration.vars.route.parameters|default({})) - ) -%} - -{% set breadcrumb = configuration.vars.breadcrumb|default(metadata.applicationName~'.ui.'~metadata.pluralName) %} - -{% set breadcrumbs = [ - { label: 'sylius.ui.administration'|trans, url: path('sylius_admin_dashboard') }, - { label: breadcrumb|trans, url: index_url }, - { label: resource.name|default(resource.code|default(resource.id)) }, - { label: 'sylius.ui.edit'|trans } - ] -%} - -{{ breadcrumb.crumble(breadcrumbs) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Update/_content.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Update/_content.html.twig deleted file mode 100644 index d011ac21ce..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Update/_content.html.twig +++ /dev/null @@ -1,25 +0,0 @@ -{% set index_url = path( - configuration.vars.index.route.name|default(configuration.getRouteName('index')), - configuration.vars.index.route.parameters|default(configuration.vars.route.parameters|default({})) - ) -%} - -
      - {{ form_start(form, {'action': path(configuration.vars.route.name|default(configuration.getRouteName('update')), configuration.vars.route.parameters|default({ 'id': resource.id })), 'attr': {'class': 'ui loadable form', 'novalidate': 'novalidate'}}) }} - - {% include '@SyliusAdmin/Crud/form_validation_errors_checker.html.twig' %} - {% if configuration.vars.templates.form is defined %} - {% include configuration.vars.templates.form %} - {% if not form._token.isRendered %} - {{ form_row(form._token) }} - {% endif %} - {% else %} - {{ form_widget(form) }} - {% endif %} - - {{ sylius_template_event([event_prefix ~ '.form', 'sylius.admin.update.form'], {'metadata': metadata, 'resource': resource, 'form': form}) }} - - {% include '@SyliusUi/Form/Buttons/_update.html.twig' with {'paths': {'cancel': sylius_generate_redirect_path(index_url)}} %} - - {{ form_end(form, {'render_rest': false}) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Update/_header.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Update/_header.html.twig deleted file mode 100644 index c0104e726a..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Update/_header.html.twig +++ /dev/null @@ -1,11 +0,0 @@ -
      -
      - {% include configuration.vars.templates.header_title|default('@SyliusAdmin/Crud/Update/_headerTitle.html.twig') %} - {% include configuration.vars.templates.breadcrumb|default('@SyliusAdmin/Crud/Update/_breadcrumb.html.twig') %} - - {{ sylius_template_event([event_prefix ~ '.header', 'sylius.admin.update.header'], {'metadata': metadata, 'resource': resource}) }} -
      -
      - {% include configuration.vars.templates.toolbar|default('@SyliusAdmin/Crud/_toolbar.html.twig') ignore missing %} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Update/_headerTitle.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Update/_headerTitle.html.twig deleted file mode 100644 index b8fb5a3703..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Update/_headerTitle.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% import '@SyliusUi/Macro/headers.html.twig' as headers %} - -{{ headers.default(header|trans, configuration.vars.icon|default('pencil'), configuration.vars.subheader|default('')|trans) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/create.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/create.html.twig deleted file mode 100644 index 0622e604ee..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/create.html.twig +++ /dev/null @@ -1,24 +0,0 @@ -{% extends '@SyliusAdmin/layout.html.twig' %} - -{% set header = configuration.vars.header|default(metadata.applicationName~'.ui.new_'~metadata.name) %} -{% set event_prefix = metadata.applicationName ~ '.admin.' ~ metadata.name ~ '.create' %} - -{% block title %}{{ header|trans }} {{ parent() }}{% endblock %} - -{% form_theme form '@SyliusAdmin/Form/theme.html.twig' %} - -{% block content %} - {{ sylius_template_event([event_prefix, 'sylius.admin.create'], _context) }} -{% endblock %} - -{% block stylesheets %} - {{ parent() }} - - {{ sylius_template_event([event_prefix ~ '.stylesheets', 'sylius.admin.create.stylesheets'], { 'metadata': metadata }) }} -{% endblock %} - -{% block javascripts %} - {{ parent() }} - - {{ sylius_template_event([event_prefix ~ '.javascripts', 'sylius.admin.create.javascripts'], { 'metadata': metadata }) }} -{% endblock %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/form_validation_errors_checker.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/form_validation_errors_checker.html.twig deleted file mode 100644 index 60a974f865..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/form_validation_errors_checker.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -{% import '@SyliusUi/Macro/messages.html.twig' as messages %} - -{% if form.vars.valid == false %} - {{ messages.error('sylius.ui.this_message_contains_errors') }} -{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/index.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/index.html.twig deleted file mode 100644 index 9a49ffb602..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/index.html.twig +++ /dev/null @@ -1,27 +0,0 @@ -{% extends '@SyliusAdmin/Shared/Crud/index.html.twig' %} - -{#{% extends '@SyliusAdmin/layout.html.twig' %}#} - -{#{% set definition = resources.definition %}#} -{#{% set data = resources.data %}#} -{#{% set event_prefix = metadata.applicationName ~ '.admin.' ~ metadata.name ~ '.index' %}#} - -{#{% set header = configuration.vars.header|default(metadata.applicationName~'.ui.'~metadata.pluralName) %}#} - -{#{% block title %}{{ header|trans }} {{ parent() }}{% endblock %}#} - -{#{% block content %}#} -{# {{ sylius_template_event([event_prefix, 'sylius.admin.index'], _context) }}#} -{#{% endblock %}#} - -{#{% block stylesheets %}#} -{# {{ parent() }}#} - -{# {{ sylius_template_event([event_prefix ~ '.stylesheets', 'sylius.admin.index.stylesheets'], { 'metadata': metadata }) }}#} -{#{% endblock %}#} - -{#{% block javascripts %}#} -{# {{ parent() }}#} - -{# {{ sylius_template_event([event_prefix ~ '.javascripts', 'sylius.admin.index.javascripts'], { 'metadata': metadata }) }}#} -{#{% endblock %}#} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/update.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/update.html.twig deleted file mode 100644 index 4154e45767..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/update.html.twig +++ /dev/null @@ -1,24 +0,0 @@ -{% extends '@SyliusAdmin/layout.html.twig' %} - -{% set header = configuration.vars.header|default(metadata.applicationName~'.ui.edit_'~metadata.name) %} -{% set event_prefix = metadata.applicationName ~ '.admin.' ~ metadata.name ~ '.update' %} - -{% block title %}{{ header|trans }} {{ parent() }}{% endblock %} - -{% form_theme form '@SyliusAdmin/Form/theme.html.twig' %} - -{% block content %} - {{ sylius_template_event([event_prefix, 'sylius.admin.update'], _context) }} -{% endblock %} - -{% block stylesheets %} - {{ parent() }} - - {{ sylius_template_event([event_prefix ~ '.stylesheets', 'sylius.admin.update.stylesheets'], { 'metadata': metadata }) }} -{% endblock %} - -{% block javascripts %} - {{ parent() }} - - {{ sylius_template_event([event_prefix ~ '.javascripts', 'sylius.admin.update.javascripts'], { 'metadata': metadata }) }} -{% endblock %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Currency/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Currency/_form.html.twig deleted file mode 100644 index 27cb3b1560..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Currency/_form.html.twig +++ /dev/null @@ -1,2 +0,0 @@ -{{ form_errors(form) }} -{{ form_row(form.code) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Form/_accountCredentials.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Form/_accountCredentials.html.twig deleted file mode 100644 index e3b9390a12..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Form/_accountCredentials.html.twig +++ /dev/null @@ -1,15 +0,0 @@ -

      {{ 'sylius.ui.account_credentials'|trans }}

      -{% if customer.user is empty or customer.user.id is null %} -
      -
      - {{ form_row(form.createUser) }} -
      -
      -{% endif %} -{% if form.user is defined %} - -{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Form/_columns.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Form/_columns.html.twig deleted file mode 100644 index 67a601cb42..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Form/_columns.html.twig +++ /dev/null @@ -1,6 +0,0 @@ -
      - {{ sylius_template_event('sylius.admin.customer.form.first_column', _context) }} -
      -
      - {{ sylius_template_event('sylius.admin.customer.form.second_column', _context) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Form/_content.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Form/_content.html.twig deleted file mode 100644 index 0ce906525e..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Form/_content.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -{{ form_errors(form) }} - -
      - {{ sylius_template_event('sylius.admin.customer.form.content', _context) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Form/_details.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Form/_details.html.twig deleted file mode 100644 index ad360dc326..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Form/_details.html.twig +++ /dev/null @@ -1,7 +0,0 @@ -

      {{ 'sylius.ui.customer_details'|trans }}

      -
      - {{ form_row(form.firstName) }} - {{ form_row(form.lastName) }} -
      -{{ form_row(form.email) }} -{{ form_row(form.group) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Form/_extraInformation.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Form/_extraInformation.html.twig deleted file mode 100644 index 463f7939bb..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Form/_extraInformation.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -

      {{ 'sylius.ui.extra_information'|trans }}

      -{{ form_row(form.gender) }} -{{ form_row(form.birthday) }} -{{ form_row(form.phoneNumber) }} -{{ form_row(form.subscribedToNewsletter) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Form/_firstColumn.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Form/_firstColumn.html.twig deleted file mode 100644 index 4a8563c5c4..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Form/_firstColumn.html.twig +++ /dev/null @@ -1,6 +0,0 @@ -
      - {{ sylius_template_event('sylius.admin.customer.form.customer_details', _context) }} -
      -
      - {{ sylius_template_event('sylius.admin.customer.form.extra_information', _context) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Form/_secondColumn.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Form/_secondColumn.html.twig deleted file mode 100644 index f9e01e365a..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Form/_secondColumn.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -
      - {{ sylius_template_event('sylius.admin.customer.form.account_credentials', _context) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Grid/Field/enabled.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Grid/Field/enabled.html.twig deleted file mode 100644 index fad5368019..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Grid/Field/enabled.html.twig +++ /dev/null @@ -1,8 +0,0 @@ -{% if data.user is not null %} - {% import '@SyliusUi/Macro/labels.html.twig' as label %} - {{ label.status(data.user.enabled) }} -{% else %} - - {{ 'sylius.ui.guest'|trans }} - -{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Grid/Field/verified.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Grid/Field/verified.html.twig deleted file mode 100644 index c834d92327..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Grid/Field/verified.html.twig +++ /dev/null @@ -1,2 +0,0 @@ -{% import '@SyliusUi/Macro/labels.html.twig' as label %} -{{ label.yesNo(data.user.verified|default(false)) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Order/Index/_breadcrumb.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Order/Index/_breadcrumb.html.twig deleted file mode 100644 index b0b04f1cce..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Order/Index/_breadcrumb.html.twig +++ /dev/null @@ -1,11 +0,0 @@ -{% import '@SyliusAdmin/Macro/breadcrumb.html.twig' as breadcrumb %} - -{% set breadcrumbs = [ - { label: 'sylius.ui.administration'|trans, url: path('sylius_admin_dashboard') }, - { label: 'sylius.ui.customers'|trans, url: path('sylius_admin_customer_index') }, - { label: app.request.attributes.get('id'), url: path('sylius_admin_customer_show', {id: app.request.attributes.get('id') })}, - { label: 'sylius.ui.orders'|trans }, - ] -%} - -{{ breadcrumb.crumble(breadcrumbs) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Order/Index/_customerHeader.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Order/Index/_customerHeader.html.twig deleted file mode 100644 index 52f375d1b8..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Order/Index/_customerHeader.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% import '@SyliusUi/Macro/headers.html.twig' as headers %} - -{{ headers.default(customer.fullname, configuration.vars.icon|default('cart'), configuration.vars.subheader|default('sylius.ui.process_your_orders')|trans) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Order/Index/_headerTitle.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Order/Index/_headerTitle.html.twig deleted file mode 100644 index 2683ff87ff..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Order/Index/_headerTitle.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -{{ render(url('sylius_admin_partial_customer_show', { - 'id': app.request.attributes.get('id'), - 'template': '@SyliusAdmin/Customer/Order/Index/_customerHeader.html.twig', - 'vars': configuration.vars -})) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/Address/_content.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/Address/_content.html.twig deleted file mode 100644 index 2dd3185be6..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/Address/_content.html.twig +++ /dev/null @@ -1,7 +0,0 @@ -
      - {% if customer.defaultAddress is not null %} - {% include '@SyliusAdmin/Common/_address.html.twig' with {'address': customer.defaultAddress} %} - {% else %} - {{ 'sylius.ui.this_customer_does_not_have_a_default_address'|trans }} - {% endif %} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/Address/_header.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/Address/_header.html.twig deleted file mode 100644 index b03d61e9dd..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/Address/_header.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -

      - {{ 'sylius.ui.default_address'|trans }} -

      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/Details/_contact.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/Details/_contact.html.twig deleted file mode 100644 index 2a84dc5eb9..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/Details/_contact.html.twig +++ /dev/null @@ -1,10 +0,0 @@ -
      - - {{ customer.email }} - - {% if customer.phoneNumber is not null %} -
      - {{ customer.phoneNumber }} -
      - {% endif %} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/Details/_email.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/Details/_email.html.twig deleted file mode 100644 index 8fbc353a71..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/Details/_email.html.twig +++ /dev/null @@ -1,19 +0,0 @@ -{% import '@SyliusUi/Macro/buttons.html.twig' as buttons %} - -
      -
      - - {{ 'sylius.ui.subscribed_to_newsletter'|trans }} -
      - {% if customer.user is not null %} - {% set user = customer.user %} -
      - - {{ 'sylius.ui.email_verified'|trans }} -
      -
      - {% if is_shop_enabled() %} - {{ buttons.default(path('sylius_admin_impersonate_user', {'username': user.emailCanonical}), 'sylius.ui.impersonate', 'impersonate', 'unhide', 'blue') }} - {% endif %} - {% endif %} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/Details/_primary.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/Details/_primary.html.twig deleted file mode 100644 index 1c5151c902..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/Details/_primary.html.twig +++ /dev/null @@ -1,12 +0,0 @@ -
      - - {{ customer.fullName|default('sylius.ui.guest_customer'|trans) }} - -
      - {{ 'sylius.ui.customer_since'|trans }} {{ customer.createdAt|date }} -
      - {% if customer.group is not null %} - {{ 'sylius.ui.group_membership'|trans }}: {{ customer.group }} - {% endif %} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/Statistics/_perChannel.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/Statistics/_perChannel.html.twig deleted file mode 100644 index eea1b23b57..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/Statistics/_perChannel.html.twig +++ /dev/null @@ -1,55 +0,0 @@ -{% import '@SyliusAdmin/Common/Macro/money.html.twig' as money %} - -
      - - {{ statistic.channel.name }} -
      -
      -
      -
      -
      -
      -
      - {% if statistic.channel.color is not empty %} - - {% endif %} - {{ statistic.channel.name }} -
      -
      - {{ 'sylius.ui.channel'|trans }} -
      -
      -
      -
      -
      -
      - {{ statistic.ordersCount }} -
      -
      - {{ 'sylius.ui.orders'|trans }} -
      -
      -
      -
      -
      -
      - {{ money.format(statistic.ordersValue, statistic.channel.baseCurrency.code) }} -
      -
      - {{ 'sylius.ui.total_value_of_orders'|trans }} -
      -
      -
      -
      -
      -
      - {{ money.format(statistic.averageOrderValue, statistic.channel.baseCurrency.code) }} -
      -
      - {{ 'sylius.ui.average_order_value'|trans }} -
      -
      -
      -
      -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/Statistics/index.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/Statistics/index.html.twig deleted file mode 100644 index 31e6ab6663..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/Statistics/index.html.twig +++ /dev/null @@ -1,13 +0,0 @@ -{% import "@SyliusAdmin/Common/Macro/money.html.twig" as money %} - -
      - {% if statistics.perChannelsStatistics is not empty %} -
      - {% for statistic in statistics.perChannelsStatistics %} - {% include '@SyliusAdmin/Customer/Show/Statistics/_perChannel.html.twig' %} - {% endfor %} -
      - {% else %} -

      {{ 'sylius.ui.this_customer_has_not_completed_any_orders_yet'|trans }}

      - {% endif %} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/_address.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/_address.html.twig deleted file mode 100644 index c076dfd379..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/_address.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -
      - {{ sylius_template_event('sylius.admin.customer.show.address', _context) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/_breadcrumb.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/_breadcrumb.html.twig deleted file mode 100644 index b270ee07ba..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/_breadcrumb.html.twig +++ /dev/null @@ -1,9 +0,0 @@ -{% import '@SyliusAdmin/Macro/breadcrumb.html.twig' as breadcrumb %} - -{% set breadcrumbs = [ - { label: 'sylius.ui.administration'|trans, url: path('sylius_admin_dashboard') }, - { label: 'sylius.ui.customers'|trans, url: path('sylius_admin_customer_index') }, - { label: customer.email } -] %} - -{{ breadcrumb.crumble(breadcrumbs) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/_content.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/_content.html.twig deleted file mode 100644 index 5b750adc07..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/_content.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -
      -
      - {{ sylius_template_event('sylius.admin.customer.show.information', _context) }} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/_contentWidget.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/_contentWidget.html.twig deleted file mode 100644 index 5a33696b0d..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/_contentWidget.html.twig +++ /dev/null @@ -1,4 +0,0 @@ -
      - {% include '@SyliusAdmin/Customer/Show/_content.html.twig' %} - {% include '@SyliusAdmin/Customer/Show/_address.html.twig' %} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/_header.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/_header.html.twig deleted file mode 100644 index 2a6f1dfc6c..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/_header.html.twig +++ /dev/null @@ -1,22 +0,0 @@ -
      -

      - -
      - {{ customer.fullName|default('sylius.ui.guest_customer'|trans) }} -
      -
      -
      - {{ customer.email }} -
      - {% if customer.user is null %} -
      - - {{ 'sylius.ui.guest'|trans }} - -
      - {% endif %} -
      -
      -
      -

      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/_headerMenu.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/_headerMenu.html.twig deleted file mode 100644 index ab2d20df41..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/_headerMenu.html.twig +++ /dev/null @@ -1,2 +0,0 @@ -{% set menu = knp_menu_get('sylius.admin.customer.show', [], {'customer': customer}) %} -{{ knp_menu_render(menu, {'template': '@SyliusUi/Menu/top.html.twig'}) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/_headerWidget.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/_headerWidget.html.twig deleted file mode 100644 index af770f9763..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/_headerWidget.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -
      - {{ sylius_template_event('sylius.admin.customer.show.header.content', _context) }} -
      - -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/_menu.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/_menu.html.twig deleted file mode 100644 index e6fe865979..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/_menu.html.twig +++ /dev/null @@ -1,20 +0,0 @@ -{% deprecated "This template is deprecated since Sylius 1.12" %} - -
      -
      - - {{ 'sylius.ui.channel'|trans }} -
      - - - {{ 'sylius.ui.orders'|trans }} - -
      - - {{ 'sylius.ui.total_value_of_orders'|trans }} -
      -
      - - {{ 'sylius.ui.average_order_value'|trans }} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/_statistics.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/_statistics.html.twig deleted file mode 100644 index c414526d85..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/_statistics.html.twig +++ /dev/null @@ -1 +0,0 @@ -{{ render(path('sylius_admin_customer_orders_statistics', {'customerId': customer.id})) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/_form.html.twig deleted file mode 100644 index 01bb25ad2e..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/_form.html.twig +++ /dev/null @@ -1 +0,0 @@ -{{ sylius_template_event('sylius.admin.customer.form', _context) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/_info.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/_info.html.twig deleted file mode 100644 index d5cdbd6e86..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/_info.html.twig +++ /dev/null @@ -1,30 +0,0 @@ -
      -
      - {{ customer.fullName }} -
      - {{ 'sylius.ui.customer_since'|trans }} {{ customer.createdAt|format_date }}. -
      -
      -
      - - - {{ customer.email }} - -
      - {% if customer.phoneNumber is not empty %} -
      - - - {{ customer.phoneNumber }} - -
      - {% endif %} - {% if order.customerIp is defined and order.customerIp is not empty %} -
      - - - {{ order.customerIp }} - -
      - {% endif %} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/show.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/show.html.twig deleted file mode 100644 index 54e018d6cc..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/show.html.twig +++ /dev/null @@ -1,7 +0,0 @@ -{% extends '@SyliusAdmin/layout.html.twig' %} - -{% block title %}{{ 'sylius.ui.customer'|trans ~' '~ customer.email }} {{ parent() }}{% endblock %} - -{% block content %} - {{ sylius_template_event('sylius.admin.customer.show.content', _context) }} -{% endblock %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/CustomerGroup/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/CustomerGroup/_form.html.twig deleted file mode 100644 index 93507532f2..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/CustomerGroup/_form.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{{ form_errors(form) }} -{{ form_row(form.code) }} -{{ form_row(form.name) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ExchangeRate/Grid/Field/sourceCurrencyName.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ExchangeRate/Grid/Field/sourceCurrencyName.html.twig deleted file mode 100644 index facdabd463..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ExchangeRate/Grid/Field/sourceCurrencyName.html.twig +++ /dev/null @@ -1 +0,0 @@ -{{ data.sourceCurrency.name }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ExchangeRate/Grid/Field/targetCurrencyName.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ExchangeRate/Grid/Field/targetCurrencyName.html.twig deleted file mode 100644 index c96e763abe..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ExchangeRate/Grid/Field/targetCurrencyName.html.twig +++ /dev/null @@ -1 +0,0 @@ -{{ data.targetCurrency.name }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ExchangeRate/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ExchangeRate/_form.html.twig deleted file mode 100644 index b66ff093c4..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ExchangeRate/_form.html.twig +++ /dev/null @@ -1,6 +0,0 @@ -{{ form_errors(form) }} -
      - {{ form_row(form.sourceCurrency) }} - {{ form_row(form.targetCurrency) }} - {{ form_row(form.ratio) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Form/imagesTheme.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Form/imagesTheme.html.twig deleted file mode 100644 index 19a66c61a0..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Form/imagesTheme.html.twig +++ /dev/null @@ -1,12 +0,0 @@ -{% extends '@SyliusUi/Form/imagesTheme.html.twig' %} - -{% block sylius_product_image_widget %} - {{ block('sylius_image_widget') }} - - {% apply spaceless %} - {% if product.id is not null and 0 != product.variants|length and not product.simple %} -
      - {{ form_row(form.productVariants, {'remote_url': path('sylius_admin_ajax_product_variants_by_phrase', {'productCode': product.code}), 'remote_criteria_type': 'contains', 'remote_criteria_name': 'phrase', 'load_edit_url': path('sylius_admin_ajax_product_variants_by_codes', {'productCode': product.code})}) }} - {% endif %} - {% endapply %} -{% endblock %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Form/theme.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Form/theme.html.twig deleted file mode 100644 index 89947c4516..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Form/theme.html.twig +++ /dev/null @@ -1,57 +0,0 @@ -{% extends '@SyliusUi/Form/theme.html.twig' %} - -{% block _sylius_product_attribute_configuration_choices_entry_widget %} - {% import '@SyliusUi/Macro/flags.html.twig' as flags %} - -
      - {% for translation in form %} -
      -
      - - {{ flags.fromLocaleCode(translation.vars.name) }} {{ translation.vars.name|sylius_locale_name }} -
      -
      - {{ form_widget(translation) }} - {{- form_errors(form) -}} -
      -
      - {% endfor %} -
      -{% endblock %} - -{% block sylius_taxon_autocomplete_choice_row %} - {{ form_row(form, {'remote_url': path('sylius_admin_ajax_taxon_by_name_phrase'), 'load_edit_url': path('sylius_admin_ajax_taxon_by_code')}) }} -{% endblock %} - -{% block sylius_product_autocomplete_choice_row %} - {{ form_row(form, {'remote_url': path('sylius_admin_ajax_product_by_name_phrase'), 'load_edit_url': path('sylius_admin_ajax_product_by_code')}) }} -{% endblock %} - -{% block sylius_channel_collection_widget %} - {% set channelsErrorCount = form.vars.channels_errors_count %} -
      - {% for channelCode, channelForm in form %} - {% set channelErrorCount = channelsErrorCount[channelCode] ?? 0 %} - - {{ channelForm.vars.label }} - {% if channelErrorCount > 0 %} - {{ channelErrorCount }} - {% endif %} - - {% endfor %} -
      - {% for channelCode, channelForm in form %} -
      - {{ form_row(channelForm, {'label': false}) }} -
      - {% endfor %} -{% endblock %} - -{% block _sylius_channel_channelPriceHistoryConfig_lowestPriceForDiscountedProductsCheckingPeriod_widget %} -
      - {{ form_widget(form) }} -
      - {{ 'sylius.ui.days'|trans }} -
      -
      -{% endblock %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Grid/Field/_channels.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Grid/Field/_channels.html.twig deleted file mode 100644 index 82103af4df..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Grid/Field/_channels.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% for channel in data %} - {% include '@SyliusAdmin/Common/_channel.html.twig' with {'channel': channel} %} -{% endfor %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Grid/_default.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Grid/_default.html.twig deleted file mode 100644 index 07c62310ac..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Grid/_default.html.twig +++ /dev/null @@ -1 +0,0 @@ -{% extends '@SyliusUi/Grid/_default.html.twig' %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Grid/deleteCatalogPromotion.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Grid/deleteCatalogPromotion.html.twig deleted file mode 100644 index 42ae925caa..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Grid/deleteCatalogPromotion.html.twig +++ /dev/null @@ -1,15 +0,0 @@ -{% set path = options.link.url|default(path(options.link.route, options.link.parameters)) %} - -
      - - - -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Inventory/Index/_breadcrumb.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Inventory/Index/_breadcrumb.html.twig deleted file mode 100644 index 42e5e2dfc2..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Inventory/Index/_breadcrumb.html.twig +++ /dev/null @@ -1,6 +0,0 @@ -{% import '@SyliusAdmin/Macro/breadcrumb.html.twig' as breadcrumb %} - -{{ breadcrumb.crumble([ - { label: 'sylius.ui.administration'|trans, url: path('sylius_admin_dashboard') }, - { label: 'sylius.ui.inventory'|trans }, -]) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_channelLinks.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_channelLinks.html.twig deleted file mode 100644 index f7cb0d943e..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_channelLinks.html.twig +++ /dev/null @@ -1,21 +0,0 @@ -{% set homepage_path = sylius_bundle_loaded_checker('SyliusShopBundle') ? path('sylius_shop_homepage') : '/' %} - -{% if channels|length > 1 %} -
      - - {{ 'sylius.ui.view_your_store'|trans }} - - -
      - {% for channel in channels|filter(channel => channel.hostname is not empty) %} - - {% include '@SyliusAdmin/Common/_channel.html.twig' %} - - {% endfor %} -
      -
      -{% elseif channels|length == 1 %} - {% set channel = channels|first %} - - {{ 'sylius.ui.view_your_store'|trans }} -{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_channelLinksWidget.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_channelLinksWidget.html.twig deleted file mode 100644 index da83422573..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_channelLinksWidget.html.twig +++ /dev/null @@ -1 +0,0 @@ -{{ render(url('sylius_admin_partial_channel_index', {'template': '@SyliusAdmin/_channelLinks.html.twig'})) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_flashes.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_flashes.html.twig deleted file mode 100644 index a49be5a4ca..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_flashes.html.twig +++ /dev/null @@ -1 +0,0 @@ -{% include '@SyliusUi/_flashes.html.twig' %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_logo.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_logo.html.twig deleted file mode 100644 index 1d9fa7d035..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_logo.html.twig +++ /dev/null @@ -1,5 +0,0 @@ - -
      - -
      -       diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_menu.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_menu.html.twig deleted file mode 100644 index 15f3c50a7a..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_menu.html.twig +++ /dev/null @@ -1,10 +0,0 @@ -
      -
      - - -
      -
      - -
      - {{ knp_menu_render('sylius.admin.main', {'template': '@SyliusUi/Menu/sidebar.html.twig', 'currentClass': 'active'}) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_notification.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_notification.html.twig deleted file mode 100644 index 2e4699db8f..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_notification.html.twig +++ /dev/null @@ -1,16 +0,0 @@ - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_notificationWidget.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_notificationWidget.html.twig deleted file mode 100644 index abd767c53d..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_notificationWidget.html.twig +++ /dev/null @@ -1 +0,0 @@ -{{ sylius_render_notifications_widget() }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_scripts.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_scripts.html.twig deleted file mode 100644 index f5f9835833..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_scripts.html.twig +++ /dev/null @@ -1 +0,0 @@ -{{ encore_entry_script_tags('admin-entry', null, 'admin') }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_search.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_search.html.twig deleted file mode 100644 index 336c46d177..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_search.html.twig +++ /dev/null @@ -1,8 +0,0 @@ -
      -
      -
      - - -
      -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_security.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_security.html.twig deleted file mode 100644 index 08ea496eff..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_security.html.twig +++ /dev/null @@ -1,15 +0,0 @@ -
      - {% include '@SyliusAdmin/AdminUser/_avatarImage.html.twig' %} - {{ app.user.firstName|default(app.user.email) }} - -
      - - - {{ 'sylius.ui.my_account'|trans }} - - - - {{ 'sylius.ui.logout'|trans }} - -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_sidebarToggle.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_sidebarToggle.html.twig deleted file mode 100644 index a3832533a1..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_sidebarToggle.html.twig +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_styles.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_styles.html.twig deleted file mode 100644 index a96144cd61..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_styles.html.twig +++ /dev/null @@ -1 +0,0 @@ -{{ encore_entry_link_tags('admin-entry', null, 'admin') }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_support.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_support.html.twig deleted file mode 100644 index 6419303489..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_support.html.twig +++ /dev/null @@ -1,26 +0,0 @@ -
      - - {{ 'sylius.ui.get_support'|trans }} -
      - - - {{ 'sylius.ui.documentation'|trans }} - - - - {{ 'sylius.ui.join_slack'|trans }} - - - - {{ 'sylius.ui.join_forum'|trans }} - - - - {{ 'sylius.ui.issue_tracker'|trans }} - - - - {{ 'sylius.ui.youtube'|trans }} - -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/layout.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/layout.html.twig deleted file mode 100644 index d4bda7f86a..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/layout.html.twig +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - {% block title %}Sylius{% endblock %} - - - - {% block metatags %} - {% endblock %} - - {% block stylesheets %} - - {% endblock %} - - - -
      - - -
      -
      - {% block sidebar %} - {% endblock %} -
      - -
      -
      -
      - -
      -
      -
      - {% block topbar %} - {% endblock %} -
      -
      - -
      - {% block flash_messages %} - {% include '@SyliusUi/_flashes.html.twig' %} - {% endblock %} - - {% block pre_content %} - {% endblock %} - - {% block content %} - {% endblock %} - - {% block post_content %} - {% endblock %} -
      - -
      - {% block footer %} - {% endblock %} -
      -
      -
      - - - - {% include '@SyliusUi/Modal/_confirmation.html.twig' %} - - {% block javascripts %} - {% endblock %} - - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Locale/Grid/Field/name.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Locale/Grid/Field/name.html.twig deleted file mode 100644 index 74c5cb194d..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Locale/Grid/Field/name.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% import "@SyliusUi/Macro/flags.html.twig" as flags %} - -{{ flags.fromLocaleCode(data.code) }} {{ data.code }} {{ data.name }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Locale/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Locale/_form.html.twig deleted file mode 100644 index 79cfdf7bcf..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Locale/_form.html.twig +++ /dev/null @@ -1,4 +0,0 @@ -{{ form_errors(form) }} -
      - {{ form_row(form.code) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Macro/breadcrumb.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Macro/breadcrumb.html.twig deleted file mode 100644 index a4bf8e8515..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Macro/breadcrumb.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -{% macro crumble(crumbs = {}) %} - {% import '@SyliusUi/Macro/breadcrumb.html.twig' as _breadcrumb %} - - {{ _breadcrumb.crumble(crumbs, path('sylius_admin_dashboard'), 'sylius.ui.administration'|trans) }} -{% endmacro %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Macro/translationForm.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Macro/translationForm.html.twig deleted file mode 100644 index e3698aed06..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Macro/translationForm.html.twig +++ /dev/null @@ -1,43 +0,0 @@ -{% macro translationForm(translations) %} - {% import '@SyliusUi/Macro/flags.html.twig' as flags %} - -
      - {% for locale, translationForm in translations %} -
      -
      - - {{ flags.fromLocaleCode(locale) }} {{ locale|sylius_locale_name }} -
      -
      - {% for field in translationForm %} - {{ form_row(field) }} - {% endfor %} -
      -
      - {% endfor %} -
      -{% endmacro %} - -{% macro translationFormWithSlug(translations, slugFieldTemplate, resource) %} - {% import '@SyliusUi/Macro/flags.html.twig' as flags %} - -
      - {% for locale, translationForm in translations %} -
      -
      - - {{ flags.fromLocaleCode(locale) }} {{ locale|sylius_locale_name }} -
      -
      - {% for field in translationForm %} - {% if field.vars.name != 'slug' %} - {{ form_row(field) }} - {% else %} - {% include slugFieldTemplate with { 'slugField': translationForm.slug, 'resource': resource } %} - {% endif %} - {% endfor %} -
      -
      - {% endfor %} -
      -{% endmacro %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Grid/Field/channel.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Grid/Field/channel.html.twig deleted file mode 100644 index 7341ba10bc..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Grid/Field/channel.html.twig +++ /dev/null @@ -1 +0,0 @@ -{% include '@SyliusAdmin/Common/_channel.html.twig' with {'channel': data} %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Grid/Field/customer.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Grid/Field/customer.html.twig deleted file mode 100644 index f72f46f7a8..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Grid/Field/customer.html.twig +++ /dev/null @@ -1,2 +0,0 @@ -{{ data.firstName }} {{ data.lastName }} -

      {{ data.email }}

      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Grid/Field/number.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Grid/Field/number.html.twig deleted file mode 100644 index 2b25fa6b8a..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Grid/Field/number.html.twig +++ /dev/null @@ -1 +0,0 @@ -#{{ data.number }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Grid/Field/total.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Grid/Field/total.html.twig deleted file mode 100644 index 13020f5f27..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Grid/Field/total.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% import "@SyliusAdmin/Common/Macro/money.html.twig" as money %} - -{{ money.format(data.total, data.currencyCode) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/History/_actions.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/History/_actions.html.twig deleted file mode 100644 index 0b21b92b94..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/History/_actions.html.twig +++ /dev/null @@ -1 +0,0 @@ -{{ 'sylius.ui.return'|trans }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/History/_address.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/History/_address.html.twig deleted file mode 100644 index 7695098a90..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/History/_address.html.twig +++ /dev/null @@ -1,8 +0,0 @@ -
      -

      - {{ ('sylius.ui.'~type~'_address')|trans }} -

      -
      - {{ render(url('sylius_admin_partial_address_log_entry_index', {'id': address.id})) }} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/History/_addresses.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/History/_addresses.html.twig deleted file mode 100644 index f19ae63164..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/History/_addresses.html.twig +++ /dev/null @@ -1,10 +0,0 @@ -
      -
      -
      - {% include '@SyliusAdmin/Order/History/_address.html.twig' with {'type': 'shipping', address: order.shippingAddress} %} -
      -
      - {% include '@SyliusAdmin/Order/History/_address.html.twig' with {'type': 'billing', address: order.billingAddress} %} -
      -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/History/_breadcrumb.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/History/_breadcrumb.html.twig deleted file mode 100644 index 9b6a439d92..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/History/_breadcrumb.html.twig +++ /dev/null @@ -1,11 +0,0 @@ -{% import '@SyliusAdmin/Macro/breadcrumb.html.twig' as breadcrumb %} - -{% set breadcrumbs = [ - { label: 'sylius.ui.administration'|trans, url: path('sylius_admin_dashboard') }, - { label: 'sylius.ui.orders'|trans, url: path('sylius_admin_order_index') }, - { label: '#'~order.number, url: path('sylius_admin_order_show', {'id': order.id}) }, - { label: 'sylius.ui.history'|trans } - ] -%} - -{{ breadcrumb.crumble(breadcrumbs) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/History/_content.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/History/_content.html.twig deleted file mode 100644 index 608083657d..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/History/_content.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -
      -
      - {% include '@SyliusAdmin/Order/History/_addresses.html.twig' %} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/History/_header.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/History/_header.html.twig deleted file mode 100644 index 2f84e2cd14..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/History/_header.html.twig +++ /dev/null @@ -1 +0,0 @@ -{% include '@SyliusAdmin/Order/Show/_header.html.twig' %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/History/_headerWidget.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/History/_headerWidget.html.twig deleted file mode 100644 index 3f3c943f78..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/History/_headerWidget.html.twig +++ /dev/null @@ -1,8 +0,0 @@ -
      -
      - {% include '@SyliusAdmin/Order/History/_header.html.twig' %} -
      -
      - {% include '@SyliusAdmin/Order/History/_actions.html.twig' %} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/PaymentState/authorized.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/PaymentState/authorized.html.twig deleted file mode 100644 index 179354854b..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/PaymentState/authorized.html.twig +++ /dev/null @@ -1,4 +0,0 @@ - - - {{ value|trans }} - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/PaymentState/awaiting_payment.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/PaymentState/awaiting_payment.html.twig deleted file mode 100644 index ecfe4d8564..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/PaymentState/awaiting_payment.html.twig +++ /dev/null @@ -1,4 +0,0 @@ - - - {{ value|trans }} - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/PaymentState/cancelled.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/PaymentState/cancelled.html.twig deleted file mode 100644 index a3d3dab88f..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/PaymentState/cancelled.html.twig +++ /dev/null @@ -1,4 +0,0 @@ - - - {{ value|trans }} - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/PaymentState/paid.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/PaymentState/paid.html.twig deleted file mode 100644 index 61e3eb92c1..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/PaymentState/paid.html.twig +++ /dev/null @@ -1,4 +0,0 @@ - - - {{ value|trans }} - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/PaymentState/partially_authorized.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/PaymentState/partially_authorized.html.twig deleted file mode 100644 index 179354854b..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/PaymentState/partially_authorized.html.twig +++ /dev/null @@ -1,4 +0,0 @@ - - - {{ value|trans }} - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/PaymentState/partially_paid.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/PaymentState/partially_paid.html.twig deleted file mode 100644 index 3a2dce9255..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/PaymentState/partially_paid.html.twig +++ /dev/null @@ -1,4 +0,0 @@ - - - {{ value|trans }} - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/PaymentState/partially_refunded.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/PaymentState/partially_refunded.html.twig deleted file mode 100644 index 74a81f519b..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/PaymentState/partially_refunded.html.twig +++ /dev/null @@ -1,4 +0,0 @@ - - - {{ value|trans }} - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/PaymentState/refunded.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/PaymentState/refunded.html.twig deleted file mode 100644 index b726dd176e..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/PaymentState/refunded.html.twig +++ /dev/null @@ -1,4 +0,0 @@ - - - {{ value|trans }} - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/ShippingState/cancelled.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/ShippingState/cancelled.html.twig deleted file mode 100644 index a3d3dab88f..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/ShippingState/cancelled.html.twig +++ /dev/null @@ -1,4 +0,0 @@ - - - {{ value|trans }} - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/ShippingState/partially_shipped.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/ShippingState/partially_shipped.html.twig deleted file mode 100644 index 3a2dce9255..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/ShippingState/partially_shipped.html.twig +++ /dev/null @@ -1,4 +0,0 @@ - - - {{ value|trans }} - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/ShippingState/ready.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/ShippingState/ready.html.twig deleted file mode 100644 index c354ff98ee..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/ShippingState/ready.html.twig +++ /dev/null @@ -1,4 +0,0 @@ - - - {{ value|trans }} - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/ShippingState/shipped.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/ShippingState/shipped.html.twig deleted file mode 100644 index 7cce852a33..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/ShippingState/shipped.html.twig +++ /dev/null @@ -1,4 +0,0 @@ - - - {{ value|trans }} - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/State/cancelled.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/State/cancelled.html.twig deleted file mode 100644 index 9062a2782d..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/State/cancelled.html.twig +++ /dev/null @@ -1,4 +0,0 @@ - - - {{ value|trans }} - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/State/fulfilled.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/State/fulfilled.html.twig deleted file mode 100644 index 895532a778..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/State/fulfilled.html.twig +++ /dev/null @@ -1,4 +0,0 @@ - - - {{ value|trans }} - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/State/new.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/State/new.html.twig deleted file mode 100644 index 2539898983..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Label/State/new.html.twig +++ /dev/null @@ -1,4 +0,0 @@ - - - {{ value|trans }} - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Payment/_completeTransition.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Payment/_completeTransition.html.twig deleted file mode 100644 index 6b4a808cb4..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Payment/_completeTransition.html.twig +++ /dev/null @@ -1,9 +0,0 @@ -{% if sm_can(payment, 'complete', 'sylius_payment') %} -
      -
      - - - -
      -
      -{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Payment/_content.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Payment/_content.html.twig deleted file mode 100644 index 3b9a1a73a9..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Payment/_content.html.twig +++ /dev/null @@ -1,10 +0,0 @@ -{% import "@SyliusAdmin/Common/Macro/money.html.twig" as money %} - -
      -
      - {{ payment.method }} -
      -
      - {{ money.format(payment.amount, payment.order.currencyCode) }} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Payment/_header.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Payment/_header.html.twig deleted file mode 100644 index b89c5a3104..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Payment/_header.html.twig +++ /dev/null @@ -1,4 +0,0 @@ -
      - {% include '@SyliusAdmin/Common/Label/paymentState.html.twig' with {'data': payment.state} %} -
      - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Payment/_refundTransition.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Payment/_refundTransition.html.twig deleted file mode 100644 index 33ecb3a491..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Payment/_refundTransition.html.twig +++ /dev/null @@ -1,9 +0,0 @@ -{% if sm_can(payment, 'refund', 'sylius_payment') %} -
      -
      - - - -
      -
      -{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Shipment/_content.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Shipment/_content.html.twig deleted file mode 100644 index f170a2f0b0..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Shipment/_content.html.twig +++ /dev/null @@ -1,11 +0,0 @@ -
      -
      - {{ shipment.method }} -
      -
      - {{ shipment.method.zone }} -
      - {% if shipment.shippedAt is not empty %} - {{ 'sylius.ui.shipped_at'|trans }}: {{ shipment.shippedAt|date('d-m-Y H:i:s') }} - {% endif %} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Shipment/_header.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Shipment/_header.html.twig deleted file mode 100644 index 237d1f90e7..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Shipment/_header.html.twig +++ /dev/null @@ -1,4 +0,0 @@ -
      - {% include '@SyliusAdmin/Common/Label/shipmentState.html.twig' with {'data': shipment.state} %} -
      - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Shipment/_resendConfirmationEmailButton.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Shipment/_resendConfirmationEmailButton.html.twig deleted file mode 100644 index 415fe1fd2b..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Shipment/_resendConfirmationEmailButton.html.twig +++ /dev/null @@ -1,6 +0,0 @@ -{% if shipment.state == shipped %} - {% set path = path('sylius_admin_shipment_resend_confirmation_email', {'id': shipment.id, '_csrf_token': csrf_token(shipment.id)}) %} - - {{ 'sylius.ui.resend_the_shipment_confirmation_email'|trans }} - -{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Shipment/_shipTransition.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Shipment/_shipTransition.html.twig deleted file mode 100644 index 4a19609b7f..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Shipment/_shipTransition.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% if sm_can(shipment, 'ship', 'sylius_shipment') %} - {{ render(path('sylius_admin_partial_shipment_ship', {'orderId': order.id, 'id': shipment.id})) }} -{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Shipment/_showButton.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Shipment/_showButton.html.twig deleted file mode 100644 index 94351a7120..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Shipment/_showButton.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -{% if shipment.state != cart %} - - {{ 'sylius.ui.show'|trans }} - -{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Shipment/_tracking.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Shipment/_tracking.html.twig deleted file mode 100644 index 8851981c12..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Shipment/_tracking.html.twig +++ /dev/null @@ -1,6 +0,0 @@ -{% if shipment.tracking is not empty %} -
      - {{ 'sylius.ui.tracking_code'|trans|upper }} -

      {{ shipment.tracking }}

      -
      -{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Summary/_item.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Summary/_item.html.twig deleted file mode 100644 index 575e75f8a6..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Summary/_item.html.twig +++ /dev/null @@ -1,50 +0,0 @@ -{% import "@SyliusAdmin/Common/Macro/money.html.twig" as money %} - -{% set orderPromotionAdjustment = constant('Sylius\\Component\\Core\\Model\\AdjustmentInterface::ORDER_PROMOTION_ADJUSTMENT') %} -{% set unitPromotionAdjustment = constant('Sylius\\Component\\Core\\Model\\AdjustmentInterface::ORDER_UNIT_PROMOTION_ADJUSTMENT') %} -{% set shippingAdjustment = constant('Sylius\\Component\\Core\\Model\\AdjustmentInterface::SHIPPING_ADJUSTMENT') %} -{% set taxAdjustment = constant('Sylius\\Component\\Core\\Model\\AdjustmentInterface::TAX_ADJUSTMENT') %} - -{% set variant = item.variant %} -{% set product = variant.product %} - -{% set aggregatedUnitPromotionAdjustments = item.getAdjustmentsTotalRecursively(unitPromotionAdjustment) + item.getAdjustmentsTotalRecursively(orderPromotionAdjustment) %} -{% set subtotal = (item.unitPrice * item.quantity) + aggregatedUnitPromotionAdjustments %} - -{% set taxIncluded = sylius_admin_order_unit_tax_included(item) %} -{% set taxExcluded = sylius_admin_order_unit_tax_excluded(item) %} - - - - {% include '@SyliusAdmin/Product/_info.html.twig' %} - - - {{ money.format(item.unitPrice, order.currencyCode) }} - - - {{ money.format(item.units.first.adjustmentsTotal(unitPromotionAdjustment), order.currencyCode) }} - - - ~ {{ money.format(item.units.first.adjustmentsTotal(orderPromotionAdjustment), order.currencyCode) }} - - - {{ money.format(item.fullDiscountedUnitPrice, order.currencyCode) }} - - - {{ item.quantity }} - - - {{ money.format(subtotal, order.currencyCode) }} - - -
      {{ money.format(taxExcluded, order.currencyCode) }}
      -
      -
      {{ money.format(taxIncluded, order.currencyCode) }} -
      - ({{ 'sylius.ui.included_in_price'|trans }}) -
      - - - {{ money.format(item.total, order.currencyCode) }} - - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Summary/_totals.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Summary/_totals.html.twig deleted file mode 100644 index 4666b39244..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Summary/_totals.html.twig +++ /dev/null @@ -1,85 +0,0 @@ -{% import "@SyliusAdmin/Common/Macro/money.html.twig" as money %} - -{% set orderShippingPromotionAdjustment = constant('Sylius\\Component\\Core\\Model\\AdjustmentInterface::ORDER_SHIPPING_PROMOTION_ADJUSTMENT') %} -{% set shippingAdjustment = constant('Sylius\\Component\\Core\\Model\\AdjustmentInterface::SHIPPING_ADJUSTMENT') %} -{% set taxAdjustment = constant('Sylius\\Component\\Core\\Model\\AdjustmentInterface::TAX_ADJUSTMENT') %} - -{% set orderShippingPromotions = sylius_aggregate_adjustments(order.getAdjustmentsRecursively(orderShippingPromotionAdjustment)) %} - - - - - {{ 'sylius.ui.tax_total'|trans }}: - {{ money.format(order.taxTotal, order.currencyCode) }} - - - {{ 'sylius.ui.items_total'|trans }}: - {{ money.format(order.itemsTotal, order.currencyCode) }} - - - - - {% if not order.adjustments(shippingAdjustment).isEmpty() %} -
      -
      {{ 'sylius.ui.shipping'|trans }}:
      - {% for shipment in order.shipments %} - {% for adjustment in shipment.adjustments(shippingAdjustment) %} -
      -
      {{ money.format(adjustment.amount, order.currencyCode) }}
      -
      -
      - {{ adjustment.label }}: -
      -
      -
      - {% endfor %} - - {% for adjustment in shipment.adjustments(taxAdjustment) %} -
      -
      - {{ money.format(adjustment.amount, order.currencyCode) }} - {% if adjustment.isNeutral %} - ({{ 'sylius.ui.included_in_price'|trans }}) - {% endif %} -
      -
      -
      - {{ adjustment.label }}: -
      -
      -
      - {% endfor %} - {% endfor %} -
      - {% else %} -

      {{ 'sylius.ui.no_shipping_charges'|trans }}

      - {% endif %} - - {% if not orderShippingPromotions is empty %} - -
      -
      {{ 'sylius.ui.shipping_discount'|trans }}:
      - {% for label, amount in orderShippingPromotions %} -
      -
      - {{ money.format(amount, order.currencyCode) }} -
      -
      - {% endfor %} -
      - - {% endif %} - - {{ 'sylius.ui.shipping_total'|trans }}: - {{ money.format(order.shippingTotal, order.currencyCode) }} - - - -{% include '@SyliusAdmin/Order/Show/Summary/_totalsPromotions.html.twig' %} - - - - {{ 'sylius.ui.order_total'|trans }}: - {{ money.format(order.total, order.currencyCode) }} - - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Summary/_totalsPromotions.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Summary/_totalsPromotions.html.twig deleted file mode 100644 index f5e376b2ec..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Summary/_totalsPromotions.html.twig +++ /dev/null @@ -1,31 +0,0 @@ -{% import "@SyliusAdmin/Common/Macro/money.html.twig" as money %} - -{% set orderPromotionAdjustment = constant('Sylius\\Component\\Core\\Model\\AdjustmentInterface::ORDER_PROMOTION_ADJUSTMENT') %} -{% set unitPromotionAdjustment = constant('Sylius\\Component\\Core\\Model\\AdjustmentInterface::ORDER_UNIT_PROMOTION_ADJUSTMENT') %} - - - - {% set orderPromotionAdjustments = sylius_aggregate_adjustments(order.getAdjustmentsRecursively(orderPromotionAdjustment)) %} - {% set unitPromotionAdjustments = sylius_aggregate_adjustments(order.getAdjustmentsRecursively(unitPromotionAdjustment)) %} - {% set promotionAdjustments = orderPromotionAdjustments|merge(unitPromotionAdjustments) %} - {% if not promotionAdjustments is empty %} -
      -
      {{ 'sylius.ui.promotions'|trans }}:
      - {% for label, amount in promotionAdjustments %} -
      -
      {{ money.format(amount, order.currencyCode) }}
      -
      {{ label }}:
      -
      - {% endfor %} -
      - {% else %} -

      {{ 'sylius.ui.no_promotion'|trans }}.

      - {% endif %} - - - {% set orderPromotionTotal = order.getAdjustmentsTotalRecursively(orderPromotionAdjustment) %} - {% set unitPromotionTotal = order.getAdjustmentsTotalRecursively(unitPromotionAdjustment) %} - {{ 'sylius.ui.promotion_total'|trans }}: - {{ money.format(orderPromotionTotal + unitPromotionTotal, order.currencyCode) }} - - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_addresses.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_addresses.html.twig deleted file mode 100644 index e0a7a15abf..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_addresses.html.twig +++ /dev/null @@ -1,21 +0,0 @@ -{% if order.billingAddress is not null %} -

      - {{ 'sylius.ui.billing_address'|trans }} -

      -
      - {% include '@SyliusAdmin/Common/_address.html.twig' with {'address': order.billingAddress} %} -
      -{% endif %} -{% if order.shippingAddress is not null %} -

      - {{ 'sylius.ui.shipping_address'|trans }} -

      -
      - {% include '@SyliusAdmin/Common/_address.html.twig' with {'address': order.shippingAddress} %} -
      -{% endif %} - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_breadcrumb.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_breadcrumb.html.twig deleted file mode 100644 index 9884c0f086..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_breadcrumb.html.twig +++ /dev/null @@ -1,10 +0,0 @@ -{% import '@SyliusAdmin/Macro/breadcrumb.html.twig' as breadcrumb %} - -{% set breadcrumbs = [ - { label: 'sylius.ui.administration'|trans, url: path('sylius_admin_dashboard') }, - { label: 'sylius.ui.orders'|trans, url: path('sylius_admin_order_index') }, - { label: '#'~order.number } - ] -%} - -{{ breadcrumb.crumble(breadcrumbs) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_content.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_content.html.twig deleted file mode 100644 index 7a9b30515f..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_content.html.twig +++ /dev/null @@ -1,8 +0,0 @@ -
      -
      - {{ sylius_template_event('sylius.admin.order.show.summary', _context) }} -
      -
      - {{ sylius_template_event('sylius.admin.order.show.sidebar', _context) }} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_customer.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_customer.html.twig deleted file mode 100644 index d999a7937c..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_customer.html.twig +++ /dev/null @@ -1 +0,0 @@ -{% include '@SyliusAdmin/Customer/_info.html.twig' %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_header.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_header.html.twig deleted file mode 100644 index b71c5fae8f..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_header.html.twig +++ /dev/null @@ -1,11 +0,0 @@ -

      - -
      - {{ 'sylius.ui.order'|trans }} #{{ order.number }} -
      -
      - {{ sylius_template_event('sylius.admin.order.show.header_items', _context) }} -
      -
      -
      -

      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_headerItems.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_headerItems.html.twig deleted file mode 100644 index fc1a79f57c..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_headerItems.html.twig +++ /dev/null @@ -1,18 +0,0 @@ -{% import '@SyliusUi/Macro/flags.html.twig' as flags %} - -
      - {{ order.checkoutCompletedAt|format_datetime }} -
      -
      - {% include [('@SyliusAdmin/Order/Label/State' ~ '/' ~ order.state ~ '.html.twig'), '@SyliusUi/Label/_default.html.twig'] with {'value': ('sylius.ui.' ~ order.state)|trans} %} -
      -
      - {{ order.currencyCode }} -
      -
      - {{ flags.fromLocaleCode(order.localeCode) }}{{ order.localeCode|sylius_locale_name }} -
      -
      - {{ 'sylius.ui.purchased_from'|trans }} - {% include '@SyliusAdmin/Common/_channel.html.twig' with {'channel': order.channel} %} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_headerWidget.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_headerWidget.html.twig deleted file mode 100644 index eea8007467..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_headerWidget.html.twig +++ /dev/null @@ -1,8 +0,0 @@ -
      -
      - {% include '@SyliusAdmin/Order/Show/_header.html.twig' %} -
      - - {% set menu = knp_menu_get('sylius.admin.order.show', [], {'order': order}) %} - {{ knp_menu_render(menu, {'template': '@SyliusUi/Menu/top.html.twig'}) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_notes.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_notes.html.twig deleted file mode 100644 index 555a70beb0..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_notes.html.twig +++ /dev/null @@ -1,8 +0,0 @@ -{% if order.notes is not null %} -

      - {{ 'sylius.ui.notes'|trans }} -

      -
      - {{ order.notes }} -
      -{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_payment.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_payment.html.twig deleted file mode 100644 index de2770050c..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_payment.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -{% import '@SyliusUi/Macro/labels.html.twig' as label %} - -
      - {{ sylius_template_event('sylius.admin.order.show.payment_content', _context) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_payments.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_payments.html.twig deleted file mode 100644 index e108b8a52c..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_payments.html.twig +++ /dev/null @@ -1,11 +0,0 @@ -{% if order.hasPayments %} -
      - {{ sylius_template_event('sylius.admin.order.show.payments_content', _context) }} -
      -{% else %} -
      - - {{ 'sylius.ui.no_payments'|trans }} - -
      -{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_paymentsContent.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_paymentsContent.html.twig deleted file mode 100644 index 369ff62432..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_paymentsContent.html.twig +++ /dev/null @@ -1,7 +0,0 @@ -{% include '@SyliusAdmin/Order/Label/PaymentState/' ~ order.paymentState ~ '.html.twig' with { 'value': 'sylius.ui.' ~ order.paymentState, 'attached': true } %} -

      {{ 'sylius.ui.payments'|trans }}

      -
      - {% for payment in order.payments %} - {% include '@SyliusAdmin/Order/Show/_payment.html.twig' %} - {% endfor %} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_resendEmail.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_resendEmail.html.twig deleted file mode 100644 index f63e013d15..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_resendEmail.html.twig +++ /dev/null @@ -1,6 +0,0 @@ -
      - {% set path = path('sylius_admin_order_resend_confirmation_email', {'id': order.id, '_csrf_token': csrf_token(order.id)}) %} - - {{ 'sylius.ui.resend_the_order_confirmation_email'|trans }} - -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_shipment.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_shipment.html.twig deleted file mode 100644 index 9ad9108d45..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_shipment.html.twig +++ /dev/null @@ -1,8 +0,0 @@ -{% import '@SyliusUi/Macro/labels.html.twig' as label %} - -{% set cart = constant('Sylius\\Component\\Shipping\\Model\\Shipment::STATE_CART') %} -{% set shipped = constant('Sylius\\Component\\Shipping\\Model\\Shipment::STATE_SHIPPED') %} - -
      - {{ sylius_template_event('sylius.admin.order.show.shipment_content', _context) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_shipments.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_shipments.html.twig deleted file mode 100644 index 6d70c719ca..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_shipments.html.twig +++ /dev/null @@ -1,4 +0,0 @@ -
      - {% include '@SyliusAdmin/Order/Label/ShippingState/' ~ order.shippingState ~ '.html.twig' with { 'value': 'sylius.ui.' ~ order.shippingState, 'attached': true } %} - {{ sylius_template_event('sylius.admin.order.show.shipments_content', _context) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_shipmentsContent.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_shipmentsContent.html.twig deleted file mode 100644 index db8468c751..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_shipmentsContent.html.twig +++ /dev/null @@ -1,8 +0,0 @@ -{% if order.hasShipments %} -

      {{ 'sylius.ui.shipments'|trans }}

      -
      - {% for shipment in order.shipments %} - {% include '@SyliusAdmin/Order/Show/_shipment.html.twig' %} - {% endfor %} -
      -{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_summary.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_summary.html.twig deleted file mode 100644 index ef491d3475..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_summary.html.twig +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - {% for item in order.items %} - {% include '@SyliusAdmin/Order/Show/Summary/_item.html.twig' %} - {% endfor %} - - - {% include '@SyliusAdmin/Order/Show/Summary/_totals.html.twig' %} - -
      {{ 'sylius.ui.order_item_product'|trans }}{{ 'sylius.ui.unit_price'|trans }}{{ 'sylius.ui.unit_discount'|trans }}{{ 'sylius.ui.distributed_order_discount'|trans }}{{ 'sylius.ui.discounted_unit_price'|trans }}{{ 'sylius.ui.quantity'|trans }}{{ 'sylius.ui.subtotal'|trans }}{{ 'sylius.ui.tax'|trans }}{{ 'sylius.ui.total'|trans }}
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_summaryWidget.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_summaryWidget.html.twig deleted file mode 100644 index 7aae5fd0ca..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_summaryWidget.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -
      - {% include '@SyliusAdmin/Order/Show/_summary.html.twig' %} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Update/_actions.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Update/_actions.html.twig deleted file mode 100644 index 0b21b92b94..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Update/_actions.html.twig +++ /dev/null @@ -1 +0,0 @@ -{{ 'sylius.ui.return'|trans }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Update/_breadcrumb.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Update/_breadcrumb.html.twig deleted file mode 100644 index 10cf145a35..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Update/_breadcrumb.html.twig +++ /dev/null @@ -1,11 +0,0 @@ -{% import '@SyliusAdmin/Macro/breadcrumb.html.twig' as breadcrumb %} - -{% set breadcrumbs = [ - { label: 'sylius.ui.administration'|trans, url: path('sylius_admin_dashboard') }, - { label: 'sylius.ui.orders'|trans, url: path('sylius_admin_order_index') }, - { label: '#'~order.number, url: path('sylius_admin_order_show', {'id': order.id}) }, - { label: 'sylius.ui.edit'|trans } - ] -%} - -{{ breadcrumb.crumble(breadcrumbs) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Update/_content.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Update/_content.html.twig deleted file mode 100644 index 515c1d53ed..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Update/_content.html.twig +++ /dev/null @@ -1,22 +0,0 @@ -{% form_theme form '@SyliusAdmin/Form/theme.html.twig' %} - -{{ form_start(form, {'action': path('sylius_admin_order_update', {'id': order.id}), 'attr': {'class': 'ui loadable form', 'novalidate': 'novalidate'}}) }} -
      - - -
      -

      {{ 'sylius.ui.shipping_address'|trans }}

      - {% include '@SyliusAdmin/Common/Form/_address.html.twig' with {'form': form.shippingAddress} %} -
      - -
      -

      {{ 'sylius.ui.billing_address'|trans }}

      - {% include '@SyliusAdmin/Common/Form/_address.html.twig' with {'form': form.billingAddress} %} -
      - - {{ sylius_template_event('sylius.admin.order.update.form', {'resource': resource}) }} - - {{ form_row(form._token) }} - {% include '@SyliusUi/Form/Buttons/_update.html.twig' with {'paths': {'cancel': sylius_generate_redirect_path(path('sylius_admin_order_index'))}} %} -
      -{{ form_end(form, {'render_rest': false}) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Update/_header.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Update/_header.html.twig deleted file mode 100644 index e7064de94b..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Update/_header.html.twig +++ /dev/null @@ -1,8 +0,0 @@ -
      -
      - {% include '@SyliusAdmin/Order/Show/_header.html.twig' %} -
      -
      - {% include '@SyliusAdmin/Order/Update/_actions.html.twig' %} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/history.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/history.html.twig deleted file mode 100644 index 9b4778e2f1..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/history.html.twig +++ /dev/null @@ -1,9 +0,0 @@ -{% extends '@SyliusAdmin/layout.html.twig' %} - -{% import '@SyliusUi/Macro/labels.html.twig' as label %} - -{% block title %}{{ 'sylius.ui.order'|trans }} #{{ order.number }} - {{ 'sylius.ui.order_history'|trans }} {{ parent() }}{% endblock %} - -{% block content %} - {{ sylius_template_event('sylius.admin.order.history.content', _context) }} -{% endblock %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/show.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/show.html.twig deleted file mode 100644 index c9506d5398..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/show.html.twig +++ /dev/null @@ -1,9 +0,0 @@ -{% extends '@SyliusAdmin/layout.html.twig' %} - -{% block title %}{{ 'sylius.ui.order'|trans ~' #'~ order.number }} {{ parent() }}{% endblock %} - -{% set customer = order.customer %} - -{% block content %} - {{ sylius_template_event('sylius.admin.order.show.content', _context) }} -{% endblock %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/update.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/update.html.twig deleted file mode 100644 index d031659506..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/update.html.twig +++ /dev/null @@ -1,10 +0,0 @@ -{% extends '@SyliusAdmin/layout.html.twig' %} - -{% import '@SyliusUi/Macro/headers.html.twig' as headers %} -{% import '@SyliusUi/Macro/buttons.html.twig' as buttons %} - -{% block title %}{{ 'sylius.ui.edit_order'|trans ~' #'~ order.number }} {{ parent() }}{% endblock %} - -{% block content %} - {{ sylius_template_event('sylius.admin.order.update.content', _context) }} -{% endblock %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/PaymentMethod/Gateways/paymentGateways.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/PaymentMethod/Gateways/paymentGateways.html.twig deleted file mode 100644 index e5235dd3c2..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/PaymentMethod/Gateways/paymentGateways.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -{% for name, gateway in gatewayFactories %} - - {{ gateway|trans }} - -{% endfor %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/PaymentMethod/Grid/Action/create.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/PaymentMethod/Grid/Action/create.html.twig deleted file mode 100644 index bed4e3c859..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/PaymentMethod/Grid/Action/create.html.twig +++ /dev/null @@ -1,12 +0,0 @@ -
      - - {{ 'sylius.ui.create'|trans }} -
      -
      - - {{ 'sylius.ui.type'|trans }} -
      -
      - {{ render(url('sylius_admin_get_payment_gateways')) }} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/PaymentMethod/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/PaymentMethod/_form.html.twig deleted file mode 100644 index b96c7c308d..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/PaymentMethod/_form.html.twig +++ /dev/null @@ -1,70 +0,0 @@ -{% import '@SyliusUi/Macro/flags.html.twig' as flags %} - -{{ form_errors(form) }} - -
      -

      {{ 'sylius.ui.details'|trans }}

      - {{ form_errors(form) }} - -
      - {{ form_row(form.code) }} - {{ form_row(form.position) }} -
      - {{ form_row(form.enabled) }} - {{ form_row(form.channels) }} -
      - -
      -

      {{ 'sylius.ui.gateway_configuration'|trans }}

      - - {% if resource.gatewayConfig.factoryName == 'stripe_checkout' %} -
      - - -
      -
      - {{ 'sylius.ui.gateway.no_sca_support_notice'|trans }} -
      -
      -
      - {% endif %} - {% if resource.gatewayConfig.factoryName == 'paypal_express_checkout' %} -
      - - -
      -
      - {% autoescape false %}{{ 'sylius.ui.gateway.pay_pal_express_checkout_deprecation_notice'|trans }}{% endautoescape %} -
      -
      -
      - {% endif %} - - {{ form_row(form.gatewayConfig.factoryName) }} - {% if form.gatewayConfig.config is defined %} - {% for field in form.gatewayConfig.config %} - {% if loop.index is odd and not loop.last %}
      {% endif %} - {{ form_row(field) }} - {% if loop.index is even %}
      {% endif %} - {% endfor %} - {% endif %} -
      - -
      - {% for locale, translationForm in form.translations %} -
      - - {{ flags.fromLocaleCode(locale) }} {{ locale|sylius_locale_name }} -
      -
      - {{ form_row(translationForm.name) }} - {{ form_row(translationForm.description) }} -
      -

      - {{ 'sylius.ui.the_instructions_below_will_be_displayed_to_the_customer'|trans }}. -

      -
      - {{ form_row(translationForm.instructions) }} -
      - {% endfor %} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Attribute/attributeChoice.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Attribute/attributeChoice.html.twig deleted file mode 100644 index 838cf47747..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Attribute/attributeChoice.html.twig +++ /dev/null @@ -1,6 +0,0 @@ -
      - {{ form_widget(form, {'attr': {'class': 'ui fluid search dropdown', 'id': 'sylius_product_attribute_choice'}}) }} - -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Attribute/attributeValues.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Attribute/attributeValues.html.twig deleted file mode 100644 index 7a8b3ecf78..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Attribute/attributeValues.html.twig +++ /dev/null @@ -1,78 +0,0 @@ -{% import _self as self %} -{% import '@SyliusUi/Macro/flags.html.twig' as flags %} - -{% set subject = metadata.name|replace({'_attribute': ''}) %} -{% for code, localeCodes in forms %} -
      -
      - {{ (localeCodes|first).vars.label }} -
      - -
      -
      -
      - {% for localeCode, form in localeCodes %} -
      - {% set id = form.vars.label|replace({' ': '_'})|lower %} -
      -
      - -
      -
      - {% if 'type_checkbox' in form.vars.cache_key %} -
      - {{ self.formField(form, count, id, '', subject, metadata.applicationName) }} - -
      - {% else %} - {{ self.formField(form, count, id, '', subject, metadata.applicationName) }} - {% endif %} -
      -
      - {% if localeCode %} - {{ 'sylius.ui.apply_to_all'|trans }} - {% endif %} -
      -
      - - - {% set count = count + 1 %} -
      - {% endfor %} -
      -
      -{% endfor %} - -{% macro formField(item, count, id, prefix, subject, applicationName) %} - {% from _self import formField %} - {% if item.children|length > 0 %} - {% set prefix = prefix~'_'~item.vars.name %} - {% for child in item.children %} - {{ formField(child, count, id, prefix, subject, applicationName) }} - {% endfor %} - {% elseif item.vars.name != '_token' %} - {% set namePrefix = prefix|replace({'_': ']['}) %} - {% set dataName = applicationName~'_'~subject~'[attributes]['~count~namePrefix~']['~item.vars.name~']' %} - {% if item.vars.multiple is defined and item.vars.multiple %} - {% set dataName = dataName~'[]' %} - {% endif %} - - {{ form_widget(item, {'id': id, 'attr': {'data-name': dataName }}) }} - {% endif %} -{% endmacro %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Attribute/attributesCollection.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Attribute/attributesCollection.html.twig deleted file mode 100644 index 3c72f4876f..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Attribute/attributesCollection.html.twig +++ /dev/null @@ -1,72 +0,0 @@ -{% extends '@SyliusAdmin/Form/theme.html.twig' %} - -{% block collection_widget -%} - {% import _self as self %} - -
      - {% set attributes = {} %} - - {% for child in form %} - {% set code = child.vars.data.attribute.code %} - - {% if attributes[code] is not defined %} - {% set attributes = attributes|merge({ (code): [] }) %} - {% endif %} - - {% set attributes = attributes|merge({ (code): attributes[code]|merge([child]) }) %} - {% endfor %} - - {% for key, attribute in attributes %} -
      -
      - {{ attribute[0].value.vars.label }} -
      - -
      -
      -
      - {% for child in attribute %} - {{ self.collection_item(child) }} - {% endfor %} -
      -
      - {% endfor %} -
      -{%- endblock collection_widget %} - -{% macro collection_item(form) %} - {% import '@SyliusUi/Macro/flags.html.twig' as flags %} - -
      -
      -
      - -
      -
      -
      - {{ form_widget(form.value) }} -
      -
      -
      - {% if form.localeCode.vars.value %} - {{ 'sylius.ui.apply_to_all'|trans }} - {% endif %} -
      -
      - {{ form_errors(form.value) }} -
      -
      - - -
      -{% endmacro %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Grid/Action/generateVariants.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Grid/Action/generateVariants.html.twig deleted file mode 100644 index 86a31bcc22..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Grid/Action/generateVariants.html.twig +++ /dev/null @@ -1,7 +0,0 @@ -{% import '@SyliusUi/Macro/buttons.html.twig' as buttons %} - -{% set path = options.link.url|default(path('sylius_admin_product_variant_generate', {'productId': options.product.id})) %} - -{% if options.product.options is not empty %} - {{ buttons.default(path, 'sylius.ui.generate', null, 'random') }} -{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Grid/Action/updatePositions.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Grid/Action/updatePositions.html.twig deleted file mode 100644 index 13c394b9c7..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Grid/Action/updatePositions.html.twig +++ /dev/null @@ -1,8 +0,0 @@ -
      - - - -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Grid/Field/image.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Grid/Field/image.html.twig deleted file mode 100644 index e7f0cab753..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Grid/Field/image.html.twig +++ /dev/null @@ -1 +0,0 @@ -{% include '@SyliusAdmin/Product/_mainImage.html.twig' with {'product': data} %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Grid/Field/mainTaxon.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Grid/Field/mainTaxon.html.twig deleted file mode 100644 index 52dac3023e..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Grid/Field/mainTaxon.html.twig +++ /dev/null @@ -1 +0,0 @@ -{% if data is not null %}{{ data.name }}{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Grid/Field/name.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Grid/Field/name.html.twig deleted file mode 100644 index c123f46d1b..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Grid/Field/name.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -{% if data is not null %} - {{ data }} -{% else %} - {% include '@SyliusAdmin/Common/_missingTranslation.html.twig' %} -{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Grid/Field/position.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Grid/Field/position.html.twig deleted file mode 100644 index 00eb4617b3..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Grid/Field/position.html.twig +++ /dev/null @@ -1 +0,0 @@ -{% include '@SyliusAdmin/Product/_position.html.twig' with {'product': data, 'taxonId': app.request.get('taxonId')} %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Index/Content/_taxonTree.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Index/Content/_taxonTree.html.twig deleted file mode 100644 index 46028df1bf..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Index/Content/_taxonTree.html.twig +++ /dev/null @@ -1 +0,0 @@ -{{ render(path('sylius_admin_partial_taxon_tree', {'template': '@SyliusAdmin/Taxon/_treeWithoutButtons.html.twig'})) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Index/Header/_breadcrumb.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Index/Header/_breadcrumb.html.twig deleted file mode 100644 index 8c0cb4513d..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Index/Header/_breadcrumb.html.twig +++ /dev/null @@ -1 +0,0 @@ -{% include configuration.vars.templates.breadcrumb|default('@SyliusAdmin/Product/Index/_breadcrumb.html.twig') %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Index/Header/_content.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Index/Header/_content.html.twig deleted file mode 100644 index 75b2a62a37..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Index/Header/_content.html.twig +++ /dev/null @@ -1,4 +0,0 @@ -{% import '@SyliusUi/Macro/headers.html.twig' as headers %} - -{% set header = configuration.vars.header|default(metadata.applicationName~'.ui.'~metadata.pluralName) %} -{{ headers.default(header|trans, configuration.vars.icon|default('cube'), configuration.vars.subheader|default('sylius.ui.manage_your_product_catalog')|trans) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Index/_breadcrumb.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Index/_breadcrumb.html.twig deleted file mode 100644 index 9848f7783b..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Index/_breadcrumb.html.twig +++ /dev/null @@ -1,18 +0,0 @@ -{% import '@SyliusAdmin/Macro/breadcrumb.html.twig' as breadcrumb %} - -{% if taxon is defined %} - {% set breadcrumbs = [ - { label: 'sylius.ui.administration'|trans, url: path('sylius_admin_dashboard') }, - { label: 'sylius.ui.products'|trans, url: path('sylius_admin_product_index') }, - { label: taxon.name }, - ] - %} -{% else %} - {% set breadcrumbs = [ - { label: 'sylius.ui.administration'|trans, url: path('sylius_admin_dashboard') }, - { label: 'sylius.ui.products'|trans }, - ] - %} -{% endif %} - -{{ breadcrumb.crumble(breadcrumbs) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Index/_content.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Index/_content.html.twig deleted file mode 100644 index cdf0664d81..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Index/_content.html.twig +++ /dev/null @@ -1,8 +0,0 @@ -
      -
      - {{ sylius_template_event('sylius.admin.product.index.content.sidebar', _context) }} -
      -
      - {{ sylius_template_event('sylius.admin.product.index.content.main', _context) }} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Index/_header.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Index/_header.html.twig deleted file mode 100644 index 989ad9a85f..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Index/_header.html.twig +++ /dev/null @@ -1,11 +0,0 @@ -{% if app.request.attributes.get('taxonId') is not null %} - {{ render(url('sylius_admin_partial_taxon_show', { - 'id': app.request.attributes.get('taxonId'), - 'template': '@SyliusAdmin/Product/Index/_taxonHeader.html.twig', - 'vars': configuration.vars - })) }} -{% else %} -
      - {{ sylius_template_event('sylius.admin.product.index.header', _context) }} -
      -{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Index/_headerWidget.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Index/_headerWidget.html.twig deleted file mode 100644 index 86ba48fea7..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Index/_headerWidget.html.twig +++ /dev/null @@ -1,4 +0,0 @@ -
      - {% include '@SyliusAdmin/Product/Index/_header.html.twig' %} - {% include '@SyliusAdmin/Crud/Index/_actions.html.twig' %} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Index/_taxonHeader.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Index/_taxonHeader.html.twig deleted file mode 100644 index ec2445ea57..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Index/_taxonHeader.html.twig +++ /dev/null @@ -1,7 +0,0 @@ -{% import '@SyliusUi/Macro/headers.html.twig' as headers %} - -
      - {{ headers.default(taxon.name, configuration.vars.icon|default('cube'), configuration.vars.subheader|default('sylius.ui.manage_your_product_catalog')|trans) }} - - {% include configuration.vars.templates.breadcrumb|default('@SyliusAdmin/Product/Index/_breadcrumb.html.twig') %} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Types/boolean.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Types/boolean.html.twig deleted file mode 100644 index c94c46d0b1..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Types/boolean.html.twig +++ /dev/null @@ -1 +0,0 @@ -{% extends '@SyliusAttribute/Types/checkbox.html.twig' %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Types/date.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Types/date.html.twig deleted file mode 100644 index 54f544308c..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Types/date.html.twig +++ /dev/null @@ -1 +0,0 @@ -{% extends '@SyliusAttribute/Types/date.html.twig' %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Types/datetime.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Types/datetime.html.twig deleted file mode 100644 index a322e7084a..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Types/datetime.html.twig +++ /dev/null @@ -1 +0,0 @@ -{% extends '@SyliusAttribute/Types/datetime.html.twig' %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Types/default.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Types/default.html.twig deleted file mode 100644 index 77ca5c3c21..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Types/default.html.twig +++ /dev/null @@ -1 +0,0 @@ -{% extends '@SyliusAttribute/Types/default.html.twig' %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Types/integer.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Types/integer.html.twig deleted file mode 100644 index e8bd6cd9a6..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Types/integer.html.twig +++ /dev/null @@ -1 +0,0 @@ -{{ attribute.value }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Types/percent.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Types/percent.html.twig deleted file mode 100644 index 81bdd9e113..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Types/percent.html.twig +++ /dev/null @@ -1 +0,0 @@ -{% extends '@SyliusAttribute/Types/percent.html.twig' %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Types/select.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Types/select.html.twig deleted file mode 100644 index d313e54beb..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Types/select.html.twig +++ /dev/null @@ -1,16 +0,0 @@ -{% if attribute.value is not null %} - {% set values = attribute.attribute.configuration.choices %} - {% if attribute.value is iterable %} - {% for value in attribute.value %} - {% if locale in values[value]|keys %} - {{ values[value][locale]|default(fallbackLocale) }}{% if loop.last == false %},{% endif %} - {% endif %} - {% endfor %} - {% else %} - {% if values[attribute.value][locale] is not empty %} - {{ values[attribute.value][locale] }} - {% elseif values[attribute.value][fallbackLocale] is not empty %} - {{ values[attribute.value][fallbackLocale] }} - {% endif %} - {% endif %} -{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Types/text.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Types/text.html.twig deleted file mode 100644 index dfd0afc501..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Types/text.html.twig +++ /dev/null @@ -1 +0,0 @@ -{% extends '@SyliusAttribute/Types/textarea.html.twig' %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/VariantItem/_button.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/VariantItem/_button.html.twig deleted file mode 100644 index b7a80133d4..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/VariantItem/_button.html.twig +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/VariantItem/_editButton.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/VariantItem/_editButton.html.twig deleted file mode 100644 index cf655288e3..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/VariantItem/_editButton.html.twig +++ /dev/null @@ -1,6 +0,0 @@ - - - - {{ 'sylius.ui.edit'|trans }} - - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/VariantItem/_item.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/VariantItem/_item.html.twig deleted file mode 100644 index 51b8c71303..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/VariantItem/_item.html.twig +++ /dev/null @@ -1,17 +0,0 @@ - -
      -
      -
      - {% if variant.hasImages %} - {% include '@SyliusAdmin/Product/_mainImage.html.twig' with {'product': variant, 'filter': 'sylius_admin_product_large_thumbnail'} %} - {% else %} - {% include '@SyliusAdmin/Product/_mainImage.html.twig' with {'product': product, 'filter': 'sylius_admin_product_large_thumbnail'} %} - {% endif %} -
      -
      -
      {{ variant.name }}
      - {{ variant.code }} -
      -
      -
      - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/VariantItem/_optionValues.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/VariantItem/_optionValues.html.twig deleted file mode 100644 index 453eb2c893..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/VariantItem/_optionValues.html.twig +++ /dev/null @@ -1,5 +0,0 @@ - - {% for optionValue in variant.optionValues %} -
      {{ optionValue.option.name }}: {{ optionValue.value }}
      - {% endfor %} - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/VariantItem/_shipping.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/VariantItem/_shipping.html.twig deleted file mode 100644 index 9445fc2911..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/VariantItem/_shipping.html.twig +++ /dev/null @@ -1,7 +0,0 @@ - - {% if variant.shippingRequired %} - {{ 'sylius.ui.shipping_required'|trans }} - {% else %} - {{ 'sylius.ui.shipping_not_required'|trans }} - {% endif %} - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/VariantItem/_stock.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/VariantItem/_stock.html.twig deleted file mode 100644 index 1d0aa19407..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/VariantItem/_stock.html.twig +++ /dev/null @@ -1 +0,0 @@ -{{ variant.onHand }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/VariantItem/_taxCategory.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/VariantItem/_taxCategory.html.twig deleted file mode 100644 index 56a39312fa..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/VariantItem/_taxCategory.html.twig +++ /dev/null @@ -1,7 +0,0 @@ - - {% if variant.taxCategory %} - {{ variant.taxCategory }} - {% else %} -
      -
      - {% endif %} - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/VariantItem/_tracking.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/VariantItem/_tracking.html.twig deleted file mode 100644 index f280933065..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/VariantItem/_tracking.html.twig +++ /dev/null @@ -1,7 +0,0 @@ - - {% if variant.tracked %} - {{ 'sylius.ui.tracked'|trans }} - {% else %} - {{ 'sylius.ui.not_tracked'|trans }} - {% endif %} - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_appliedPromotions.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_appliedPromotions.html.twig deleted file mode 100644 index 35c2c16b1f..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_appliedPromotions.html.twig +++ /dev/null @@ -1,18 +0,0 @@ -{% if channelPricing.appliedPromotions is empty %} - - -{% else %} - - - -{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_associations.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_associations.html.twig deleted file mode 100644 index 1c5f899d9b..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_associations.html.twig +++ /dev/null @@ -1,17 +0,0 @@ -
      -

      {{ 'sylius.ui.associations'|trans }}

      -
      - {% if product.associations is not empty %} - {% for association in product.associations %} - {{ association.type.name }}: -
        - {% for associatedProduct in association.associatedProducts %} -
      • {{ associatedProduct.name }}
        • - {% endfor %} -
      - {% endfor %} - {% else %} - {{ 'sylius.ui.no_associations_to_display'|trans }} - {% endif %} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_attributes.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_attributes.html.twig deleted file mode 100644 index acf0e1b43c..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_attributes.html.twig +++ /dev/null @@ -1,48 +0,0 @@ -{% import '@SyliusUi/Macro/flags.html.twig' as flags %} - -
      -

      {{ 'sylius.ui.attributes'|trans }}

      -
      -
      - {% set setLocales = [] %} - {% for attributeValue in product.attributes %} - {% if attributeValue.localeCode not in setLocales %} - {% set localeCode = attributeValue.localeCode %} - {% if attributeValue.localeCode is not null %} - {{ flags.fromLocaleCode(localeCode)}} {{ localeCode|sylius_locale_name }} - {% else %} - - {% endif %} - {% set setLocales = setLocales|merge([localeCode]) %} - {% endif %} - {% endfor %} -
      - {% for locale in setLocales %} - {% set data_tab = (locale is not null ? locale|sylius_locale_name : 'non-translatable') %} -
      - - - {% for attributeValue in product.attributes|filter(attributeValue => attributeValue.localeCode == locale) %} - - - - - {% endfor %} - -
      - {{ attributeValue.name }} - - {% include [ - '@SyliusAdmin/Product/Show/Types/'~attributeValue.type~'.html.twig', - '@SyliusAttribute/Types/'~attributeValue.type~'.html.twig', - '@SyliusAdmin/Product/Show/Types/default.html.twig' - ] with { - 'attribute': attributeValue, - 'locale': configuration.request.locale, - 'fallbackLocale': configuration.request.defaultLocale - } %} -
      -
      - {% endfor %} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_breadcrumb.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_breadcrumb.html.twig deleted file mode 100644 index 203ca9045c..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_breadcrumb.html.twig +++ /dev/null @@ -1,9 +0,0 @@ -{% import '@SyliusAdmin/Macro/breadcrumb.html.twig' as breadcrumb %} - -{% set breadcrumbs = [ - { label: 'sylius.ui.administration'|trans, url: path('sylius_admin_dashboard') }, - { label: 'sylius.ui.products'|trans, url: path('sylius_admin_product_index') }, - { label: resource.name|default(resource.code|default(resource.id)) } -] %} - -{{ breadcrumb.crumble(breadcrumbs) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_configurableProduct.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_configurableProduct.html.twig deleted file mode 100644 index eaf0ac8929..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_configurableProduct.html.twig +++ /dev/null @@ -1,26 +0,0 @@ -{% include '@SyliusAdmin/Product/Show/_header.html.twig' %} - -
      -
      - {% include '@SyliusAdmin/Product/Show/_taxonomy.html.twig' %} -
      -
      - {% include '@SyliusAdmin/Product/Show/_options.html.twig' %} -
      -
      - -{% include '@SyliusAdmin/Product/Show/_media.html.twig' %} - -{% include '@SyliusAdmin/Product/Show/_moreDetails.html.twig' %} - -
      -
      - {% include '@SyliusAdmin/Product/Show/_attributes.html.twig' %} -
      -
      - {% include '@SyliusAdmin/Product/Show/_associations.html.twig' %} -
      -
      - - -{{ sylius_template_event('sylius.admin.configurable_product.show', _context) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_details.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_details.html.twig deleted file mode 100644 index 5a5a356e61..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_details.html.twig +++ /dev/null @@ -1,8 +0,0 @@ -
      -

      {{ 'sylius.ui.details'|trans }}

      -
      -
      - {{ sylius_template_event('sylius.admin.simple_product.show.details_content', _context) }} -
      -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_detailsLabels.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_detailsLabels.html.twig deleted file mode 100644 index 92f5fb936f..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_detailsLabels.html.twig +++ /dev/null @@ -1,17 +0,0 @@ -{% if product.enabled %} - {{ 'sylius.ui.enabled'|trans }} -{% else %} - {{ 'sylius.ui.disabled'|trans }} -{% endif %} - -{% if product.variants.first.tracked %} - {{ 'sylius.ui.tracked'|trans }} -{% else %} - {{ 'sylius.ui.not_tracked'|trans }} -{% endif %} - -{% if product.variants.first.shippingRequired %} - {{ 'sylius.ui.shipping_required'|trans }} -{% else %} - {{ 'sylius.ui.shipping_not_required'|trans }} -{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_detailsTable.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_detailsTable.html.twig deleted file mode 100644 index 13144a3527..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_detailsTable.html.twig +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - -
      {{ 'sylius.ui.code'|trans }}{{ product.code }}
      {{ 'sylius.ui.channels'|trans }} - {% for channel in product.channels %} -
      - - {{ channel }} -
      - {% endfor %} -
      {{ 'sylius.ui.current_stock'|trans }}{{ product.variants.first.onHand }}
      {{ 'sylius.ui.tax_category'|trans }}{{ product.variants.first.taxCategory }}
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_header.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_header.html.twig deleted file mode 100644 index 3823478ae0..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_header.html.twig +++ /dev/null @@ -1,21 +0,0 @@ - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_imageVariants.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_imageVariants.html.twig deleted file mode 100644 index eed782bd78..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_imageVariants.html.twig +++ /dev/null @@ -1,11 +0,0 @@ -
      -{% if product.getVariantSelectionMethod() == 'match' %} - {% for variant in image.productVariants %} -
      - {% endfor %} -{% else %} - {% for variant in image.productVariants %} -
      - {% endfor %} -{% endif %} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_mainImage.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_mainImage.html.twig deleted file mode 100644 index 4a44de1f2b..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_mainImage.html.twig +++ /dev/null @@ -1,9 +0,0 @@ -{% if product.imagesByType('thumbnail') is not empty %} - {% set path = product.imagesByType('thumbnail').first.path|imagine_filter(filter|default('sylius_admin_product_thumbnail')) %} -{% elseif product.images.first %} - {% set path = product.images.first.path|imagine_filter(filter|default('sylius_admin_product_thumbnail')) %} -{% else %} - {% set path = asset('build/admin/images/200x200.png', 'admin') %} -{% endif %} - -{{ product.name }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_media.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_media.html.twig deleted file mode 100644 index da50ea8550..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_media.html.twig +++ /dev/null @@ -1,23 +0,0 @@ -
      -
      - - {{ 'sylius.ui.media'|trans }} -
      -
      - {% if product.images|length >= 1 %} -
      - {% for image in product.images %} - {% set path = image.path is not null ? image.path|imagine_filter('sylius_admin_product_small_thumbnail') : asset('build/admin/images/200x200.png', 'admin') %} -
      - {% if product.isConfigurable() and product.variants|length > 0 %} - {% include '@SyliusAdmin/Product/Show/_imageVariants.html.twig' %} - {% endif %} - - {{ product.name }} - -
      - {% endfor %} -
      - {% endif %} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_moreDetails.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_moreDetails.html.twig deleted file mode 100644 index dd1def95e5..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_moreDetails.html.twig +++ /dev/null @@ -1,40 +0,0 @@ -{% import '@SyliusUi/Macro/flags.html.twig' as flags %} - -
      - {% for translation in product.translations %} -
      - - {{ flags.fromLocaleCode(translation.locale) }} {{ translation.locale|sylius_locale_name }} -
      -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {{ 'sylius.ui.name'|trans }}{{ translation.name }}
      {{ 'sylius.ui.slug'|trans }}{{ translation.slug }}
      {{ 'sylius.ui.description'|trans }}{{ translation.description|nl2br }}
      {{ 'sylius.ui.meta_keywords'|trans }}{{ translation.metaKeywords }}
      {{ 'sylius.ui.meta_description'|trans }}{{ translation.metaDescription }}
      {{ 'sylius.ui.short_description'|trans }}{{ translation.shortDescription }}
      -
      - {% endfor %} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_options.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_options.html.twig deleted file mode 100644 index 37713bdb12..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_options.html.twig +++ /dev/null @@ -1,12 +0,0 @@ -
      -

      {{ 'sylius.ui.options'|trans }}

      -
      -
      -
        - {% for option in product.options %} -
      • {{ option }}
        • - {% endfor %} -
      -
      -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_pricing.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_pricing.html.twig deleted file mode 100644 index 948bd60219..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_pricing.html.twig +++ /dev/null @@ -1,43 +0,0 @@ -{% import "@SyliusAdmin/Common/Macro/money.html.twig" as money %} -
      -

      {{ 'sylius.ui.pricing'|trans }}

      -
      - - - - - - - - - - - - - {% for channelPricing in product.variants.first.channelPricings %} - {% if product.channels.first != false %} - - - - - - {% include '@SyliusAdmin/Product/Show/_appliedPromotions.html.twig' %} - - - {% endif %} - {% endfor %} - -
      {{ 'sylius.ui.channels'|trans }}{{ 'sylius.ui.price'|trans }}{{ 'sylius.ui.original_price'|trans }}{{ 'sylius.ui.lowest_price_before_discount'|trans }}{{ 'sylius.ui.discounted_by'|trans }}{{ 'sylius.ui.history'|trans }}
      - {{ channelPricing.channelCode|sylius_channel_name }} - {{ money.format(channelPricing.price, product.channels.first.baseCurrency) }}{{ channelPricing.originalPrice ? money.format(channelPricing.originalPrice, product.channels.first.baseCurrency) : '-' }}{{ channelPricing.lowestPriceBeforeDiscount ? money.format(channelPricing.lowestPriceBeforeDiscount, product.channels.first.baseCurrency) : '-' }} - - - {{ 'sylius.ui.show'|trans }} - -
      -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_shipping.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_shipping.html.twig deleted file mode 100644 index c55924dba6..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_shipping.html.twig +++ /dev/null @@ -1,29 +0,0 @@ -
      -

      {{ 'sylius.ui.shipping'|trans }}

      -
      - - - - - - - - - - - - - - - - - - - - - - - -
      {{ 'sylius.ui.shipping_category'|trans }}{{ product.variants.first.shippingCategory is not empty ? product.variants.first.shippingCategory : '-' }}
      {{ 'sylius.ui.width'|trans }}{{ product.variants.first.width is not empty ? product.variants.first.width : '-' }}
      {{ 'sylius.ui.height'|trans }}{{ product.variants.first.height is not empty ? product.variants.first.height : '-' }}
      {{ 'sylius.ui.depth'|trans }}{{ product.variants.first.depth is not empty ? product.variants.first.depth : '-' }}
      {{ 'sylius.ui.weight'|trans }}{{ product.variants.first.weight is not empty ? product.variants.first.weight : '-' }}
      -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_simpleProduct.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_simpleProduct.html.twig deleted file mode 100644 index d9ab73da7d..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_simpleProduct.html.twig +++ /dev/null @@ -1,29 +0,0 @@ -{% include '@SyliusAdmin/Product/Show/_header.html.twig' %} - -
      -
      - {{ sylius_template_event('sylius.admin.simple_product.show.details', _context) }} - - {{ sylius_template_event('sylius.admin.simple_product.show.taxonomy', _context) }} -
      -
      - {{ sylius_template_event('sylius.admin.simple_product.show.pricing', _context) }} - - {{ sylius_template_event('sylius.admin.simple_product.show.shipping', _context) }} -
      -
      - -{{ sylius_template_event('sylius.admin.simple_product.show.media', _context) }} - - -{{ sylius_template_event('sylius.admin.simple_product.show.more_details', _context) }} - - -
      -
      - {{ sylius_template_event('sylius.admin.simple_product.show.attributes', _context) }} -
      -
      - {{ sylius_template_event('sylius.admin.simple_product.show.associations', _context) }} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_taxonomy.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_taxonomy.html.twig deleted file mode 100644 index 8598f71a83..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_taxonomy.html.twig +++ /dev/null @@ -1,25 +0,0 @@ -
      -

      {{ 'sylius.ui.taxonomy'|trans }}

      -
      - - - {% if product.mainTaxon != null %} - - - - - {% endif %} - - - - - -
      {{ 'sylius.ui.main_taxon'|trans }}{{ product.mainTaxon.getFullName }}
      {{ 'sylius.ui.product_taxons'|trans }} -
        - {% for productTaxon in product.productTaxons %} -
      • {{ productTaxon.getTaxon.getFullName }}
        • - {% endfor %} -
      -
      -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_variantContent.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_variantContent.html.twig deleted file mode 100644 index 612b69581c..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_variantContent.html.twig +++ /dev/null @@ -1,9 +0,0 @@ - - -
      -
      - {{ sylius_template_event('sylius.admin.configurable_product.show.variant_content', _context) }} -
      -
      - - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_variantContentPricing.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_variantContentPricing.html.twig deleted file mode 100644 index 16184f88ee..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_variantContentPricing.html.twig +++ /dev/null @@ -1,43 +0,0 @@ -{% import "@SyliusAdmin/Common/Macro/money.html.twig" as money %} - -
      -
      -
      - {{ 'sylius.ui.pricing'|trans }} -
      - - - - - - - - - - - {% set currencies = sylius_channels_currencies() %} - {% for channelPricing in variant.channelPricings %} - - - - - - {% include '@SyliusAdmin/Product/Show/_appliedPromotions.html.twig' %} - - - {% endfor %} - -
      {{ 'sylius.ui.channels'|trans }}{{ 'sylius.ui.price'|trans }}{{ 'sylius.ui.original_price'|trans }}{{ 'sylius.ui.lowest_price_before_discount'|trans }}{{ 'sylius.ui.discounted_by'|trans }}{{ 'sylius.ui.history'|trans }}
      - {{ channelPricing.channelCode|sylius_channel_name }} - {{ money.format(channelPricing.price, product.channels.first.baseCurrency) }}{{ channelPricing.originalPrice ? money.format(channelPricing.originalPrice, product.channels.first.baseCurrency) : '-' }}{{ channelPricing.lowestPriceBeforeDiscount ? money.format(channelPricing.lowestPriceBeforeDiscount, product.channels.first.baseCurrency) : '-' }} - - - {{ 'sylius.ui.show'|trans }} - -
      -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_variantContentShipping.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_variantContentShipping.html.twig deleted file mode 100644 index 04cc40e2c8..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_variantContentShipping.html.twig +++ /dev/null @@ -1,37 +0,0 @@ -
      -
      -
      - {{ 'sylius.ui.shipping'|trans }} -
      - {% if variant.shippingCategory is same as(null) and variant.width is same as(null) and variant.height is same as(null) and variant.depth is same as(null) and variant.weight is same as(null) %} -
      -

      {{ 'sylius.ui.no_shipping_data'|trans }}

      -
      - {% else %} - - - - - - - - - - - - - - - - - - - - - - - -
      {{ 'sylius.ui.shipping_category'|trans }}{{ variant.shippingCategory }}
      {{ 'sylius.ui.width'|trans }}{{ variant.width }}
      {{ 'sylius.ui.height'|trans }}{{ variant.height }}
      {{ 'sylius.ui.depth'|trans }}{{ variant.depth }}
      {{ 'sylius.ui.weight'|trans }}{{ variant.weight }}
      - {% endif %} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_variantItem.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_variantItem.html.twig deleted file mode 100644 index 36e2cb4211..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_variantItem.html.twig +++ /dev/null @@ -1,3 +0,0 @@ - - {{ sylius_template_event('sylius.admin.configurable_product.show.variant_item', _context) }} - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_variants.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_variants.html.twig deleted file mode 100644 index 1a1d3e7d9f..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_variants.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -
      -

      {{ 'sylius.ui.list_variants'|trans }}

      - - {{ sylius_template_event('sylius.admin.product.show.variants_content', _context) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_variantsContent.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_variantsContent.html.twig deleted file mode 100644 index 283734f42d..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_variantsContent.html.twig +++ /dev/null @@ -1,22 +0,0 @@ -
      - - - - - - - - - - - - - - - {% for variant in product.variants %} - {% include '@SyliusAdmin/Product/Show/_variantItem.html.twig' %} - {% include '@SyliusAdmin/Product/Show/_variantContent.html.twig' %} - {% endfor %} - -
      {{ 'sylius.ui.name'|trans }}{{ 'sylius.ui.options'|trans }}{{ 'sylius.ui.tracked'|trans }}{{ 'sylius.ui.shipping_required'|trans }}{{ 'sylius.ui.tax_category'|trans }}{{ 'sylius.ui.current_stock'|trans }}{{ 'sylius.ui.actions'|trans }}
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Tab/_associations.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Tab/_associations.html.twig deleted file mode 100644 index 007a79ef8f..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Tab/_associations.html.twig +++ /dev/null @@ -1,28 +0,0 @@ -
      -

      {{ 'sylius.ui.associations'|trans }}

      - -
      - {% for associationForm in form.associations %} -
      - {{- form_label(associationForm) -}} -
      - {{ form_widget(associationForm, {'attr': {'class': 'autocomplete'}}) }} - -
      {{'sylius.ui.select_products'|trans}}
      -
      - {% for association in product.associations %} - {% if association.type.code == associationForm.vars.name %} - {% for associatedProduct in association.associatedProducts %} -
      {{ associatedProduct.name|default(associatedProduct.code) }}
      - {% endfor %} - {% endif %} - {% endfor %} -
      -
      - {{ form_errors(associationForm) }} -
      - {% endfor %} - - {{ sylius_template_event(['sylius.admin.product.' ~ action ~ '.tab_associations', 'sylius.admin.product.tab_associations'], {'form': form}) }} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Tab/_attributes.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Tab/_attributes.html.twig deleted file mode 100644 index 2be9ffa6f2..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Tab/_attributes.html.twig +++ /dev/null @@ -1,14 +0,0 @@ -{% form_theme form '@SyliusAdmin/Product/Attribute/attributesCollection.html.twig' %} - -
      -

      {{ 'sylius.ui.attributes'|trans }}

      - -
      - {{ render(url('sylius_admin_get_product_attributes')) }} -
      - {{ form_widget(form.attributes, {'attr': {'translations': form.translations} }) }} -
      - - {{ sylius_template_event(['sylius.admin.product.' ~ action ~ '.tab_attributes', 'sylius.admin.product.tab_attributes'], {'form': form}) }} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Tab/_details.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Tab/_details.html.twig deleted file mode 100644 index 4f7deb2fe9..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Tab/_details.html.twig +++ /dev/null @@ -1,68 +0,0 @@ -{% from '@SyliusAdmin/Macro/translationForm.html.twig' import translationFormWithSlug %} - -
      -

      {{ 'sylius.ui.details'|trans }}

      - -
      - {{ form_errors(form) }} - -
      -
      -
      - {{ form_row(form.code) }} - {{ form_row(form.enabled) }} - {% if product.simple %} - {{ form_row(form.variant.shippingRequired) }} - {% else %} - {{ form_row(form.options, {'remote_url': path('sylius_admin_ajax_product_options_by_phrase'), 'load_edit_url': path('sylius_admin_ajax_find_product_options')}) }} - {{ form_row(form.variantSelectionMethod) }} - {% endif %} - - {# Nothing to see here. #} - -
      -
      -
      - {{ form_row(form.channels) }} -
      -
      - {% if product.simple %} -
      -
      -

      {{ 'sylius.ui.pricing'|trans }}

      - {% include "@SyliusAdmin/Product/_channel_pricing.html.twig" with { product: product, variantForm: form.variant } only %} -
      -
      - {% endif %} - - {{ translationFormWithSlug(form.translations, '@SyliusAdmin/Product/_slugField.html.twig', product) }} - {% if product.simple %} - -
      -
      -

      {{ 'sylius.ui.shipping'|trans }}

      -
      - {{ form_row(form.variant.shippingCategory) }} - {{ form_row(form.variant.width) }} - {{ form_row(form.variant.height) }} - {{ form_row(form.variant.depth) }} - {{ form_row(form.variant.weight) }} -
      -
      -
      -

      {{ 'sylius.ui.taxes'|trans }}

      -
      - {{ form_row(form.variant.taxCategory) }} -
      -
      -
      - {% endif %} - - {{ sylius_template_event(['sylius.admin.product.' ~ action ~ '.tab_details', 'sylius.admin.product.tab_details'], {'form': form}) }} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Tab/_inventory.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Tab/_inventory.html.twig deleted file mode 100644 index 6da3b8b4e2..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Tab/_inventory.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -
      - {{ sylius_template_event('sylius.admin.product.tab_inventory_content', _context) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Tab/_inventoryContent.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Tab/_inventoryContent.html.twig deleted file mode 100644 index 300f40ae76..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Tab/_inventoryContent.html.twig +++ /dev/null @@ -1,16 +0,0 @@ -

      {{ 'sylius.ui.inventory'|trans }}

      -
      - {% if product.simple %} - {{ form_row(form.variant.onHand) }} -
      - - {{ form_row(form.variant.tracked) }} -
      - {{ form_help(form.variant.tracked) }} -
      - - {{ form_row(form.variant.version) }} - {% endif %} -
      - -{{ sylius_template_event(['sylius.admin.product.' ~ action ~ '.tab_inventory', 'sylius.admin.product.tab_inventory'], {'form': form}) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Tab/_media.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Tab/_media.html.twig deleted file mode 100644 index 6d05301a53..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Tab/_media.html.twig +++ /dev/null @@ -1,11 +0,0 @@ -{% form_theme form '@SyliusAdmin/Form/imagesTheme.html.twig' %} - -
      -

      {{ 'sylius.ui.media'|trans }}

      - -
      - {{ form_row(form.images, {'label': false}) }} - - {{ sylius_template_event(['sylius.admin.product.' ~ action ~ '.tab_media', 'sylius.admin.product.tab_media'], {'form': form}) }} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Tab/_taxonomy.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Tab/_taxonomy.html.twig deleted file mode 100644 index 98dba32810..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Tab/_taxonomy.html.twig +++ /dev/null @@ -1,20 +0,0 @@ -
      -

      {{ 'sylius.ui.taxonomy'|trans }}

      - -
      - {{ form_row(form.mainTaxon) }} - -

      {{ 'sylius.ui.product_taxon'|trans }}

      -
      - {{ form_widget(form.productTaxons) }} -
      -
      -
      -
      - - {{ sylius_template_event(['sylius.admin.product.' ~ action ~ '.tab_taxonomy', 'sylius.admin.product.tab_taxonomy'], {'form': form}) }} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Update/_toolbar.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Update/_toolbar.html.twig deleted file mode 100644 index 4c664137f8..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Update/_toolbar.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -
      - {% set menu = knp_menu_get('sylius.admin.product.update', [], {'product': product}) %} - {{ knp_menu_render(menu, {'template': '@SyliusUi/Menu/top.html.twig'}) }} - {% include '@SyliusAdmin/Product/_showInShopButton.html.twig' %} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/_channel_pricing.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/_channel_pricing.html.twig deleted file mode 100644 index 6d4014a50e..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/_channel_pricing.html.twig +++ /dev/null @@ -1,27 +0,0 @@ -
      - {{ form_errors(variantForm.channelPricings) }} -
      - {% for channelCode, channelPricing in variantForm.channelPricings %} - {% if loop.index0 == 0 %} - {{ channelPricing.vars.label }} - {% else %} - {{ channelPricing.vars.label }} - {% endif %} - {% endfor %} -
      - {% for channelCode, channelPricing in variantForm.channelPricings %} - {% if loop.index0 == 0 %} -
      - {% else %} -
      - {% endif %} - - {% if channelCode not in product.channels|map(channel => channel.code) %} -
      - {{ 'sylius.ui.product.product_not_active_in_channel'|trans }} -
      - {% endif %} - {{ form_row(channelPricing, {'label': false}) }} -
      - {% endfor %} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/_form.html.twig deleted file mode 100644 index 1b884f8109..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/_form.html.twig +++ /dev/null @@ -1,2 +0,0 @@ -{% set menu = knp_menu_get('sylius.admin.product_form', [], {'product': product}) %} -{{ knp_menu_render(menu, {'template': '@SyliusAdmin/Product/_menu.html.twig', 'form': form, 'product': product}) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/_info.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/_info.html.twig deleted file mode 100644 index 41c8c0f5f8..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/_info.html.twig +++ /dev/null @@ -1,24 +0,0 @@ -
      - {% include '@SyliusAdmin/Product/_mainImage.html.twig' with {'product': product, 'filter': 'sylius_admin_product_tiny_thumbnail'} %} -
      -
      {{ item.productName }}
      - - {{ variant.code }} - -
      -
      -{% if product.hasOptions() %} -
      - {% for optionValue in variant.optionValues %} -
      - {{ optionValue.value }} -
      - {% endfor %} -
      -{% elseif item.variantName is not null %} -
      -
      - {{ item.variantName }} -
      -
      -{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/_mainImage.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/_mainImage.html.twig deleted file mode 100644 index 6fb55dcb60..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/_mainImage.html.twig +++ /dev/null @@ -1,9 +0,0 @@ -{% if product.imagesByType('thumbnail') is not empty %} - {% set path = product.imagesByType('thumbnail').first.path|imagine_filter(filter|default('sylius_admin_product_thumbnail')) %} -{% elseif product.images.first %} - {% set path = product.images.first.path|imagine_filter(filter|default('sylius_admin_product_thumbnail')) %} -{% else %} - {% set path = asset('build/admin/images/50x50.png', 'admin') %} -{% endif %} - - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/_menu.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/_menu.html.twig deleted file mode 100644 index 8024bb3eb8..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/_menu.html.twig +++ /dev/null @@ -1,40 +0,0 @@ -{% extends 'knp_menu.html.twig' %} - -{% if 'create' in app.request.attributes.get('_route') %} - {% set action = 'create' %} -{% else %} - {% set action = 'update' %} -{% endif %} - -{% block list %} -{% set form = (options.form) %} -
      -
      -
      - {% for item in item.children %} - {{ block('item') }} - {% endfor %} -
      -
      -
      - {{ form_errors(form) }} -
      - {% for item in item.children %} - {% include item.attribute('template') with {'form': form, 'product': options.product} %} - {% endfor %} -
      -
      -
      -{% endblock %} - -{% block item %} - {%- set attributes = item.attributes %} - {%- set classes = item.attribute('class') is not empty ? [item.attribute('class')] : [] %} - {%- if item.actsLikeFirst %} - {%- set classes = classes|merge(['active']) %} - {%- endif %} - {%- if classes is not empty %} - {%- set attributes = attributes|merge({'class': classes|join(' ')}) %} - {%- endif %} - {{ item.label|trans }} -{% endblock %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/_position.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/_position.html.twig deleted file mode 100644 index 44984003e9..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/_position.html.twig +++ /dev/null @@ -1,19 +0,0 @@ -{% if taxonId %} - {% for productTaxon in product.productTaxons%} - {% if taxonId == productTaxon.taxon.id %} -
      -
      - -
      -
      - {% endif %} - {% endfor %} -{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/_showInShopButton.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/_showInShopButton.html.twig deleted file mode 100644 index 37ac161938..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/_showInShopButton.html.twig +++ /dev/null @@ -1,54 +0,0 @@ -{% set enabledChannels = product.channels|filter(channel => channel.enabled == true) %} - -{% if sylius_bundle_loaded_checker('SyliusShopBundle') %} - {% if not product.enabled or enabledChannels|length < 1 %} - - - {{ 'sylius.ui.show_product_in_shop_page'|trans }} - - {% elseif enabledChannels|length > 1 %} -
      - - - {{ 'sylius.ui.show_product_in_shop_page'|trans }} - -
      -
      - {% for channel in enabledChannels %} - {% set product_translation = sylius_product_translation(product, channel) %} - {% if product_translation is not null %} - {% set url = sylius_channel_url(path('sylius_shop_product_show', {'slug': product_translation.slug, '_locale': product_translation.locale}), channel) %} - {% endif %} - - - - {{ 'sylius.ui.show_in'|trans }} - {{ channel.name }} ({{ channel.code }}) - - {% endfor %} -
      -
      -
      - {% else %} - {% for channel in enabledChannels %} - {% set product_translation = sylius_product_translation(product, channel) %} - {% if product_translation is not null %} - {% set url = sylius_channel_url(path('sylius_shop_product_show', {'slug': product_translation.slug, '_locale': product_translation.locale}), channel) %} - {% endif %} - - - - {{ 'sylius.ui.show_product_in_shop_page'|trans }} - - {% endfor %} - {% endif %} -{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/_slugField.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/_slugField.html.twig deleted file mode 100644 index 9fde0117f7..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/_slugField.html.twig +++ /dev/null @@ -1,14 +0,0 @@ -
      - {{ form_label(slugField) }} - {% if slugField.vars.value == null %} - {{ form_widget(slugField, {'attr': {'data-url': path('sylius_admin_ajax_generate_product_slug')}}) }} - {% else %} -
      - {{ form_widget(slugField, {'attr': {'readonly': 'readonly', 'data-url': path('sylius_admin_ajax_generate_product_slug')}}) }} - - - -
      - {% endif %} - {{ form_errors(slugField) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/index.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/index.html.twig deleted file mode 100644 index f8ed525c45..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/index.html.twig +++ /dev/null @@ -1,12 +0,0 @@ -{% extends '@SyliusAdmin/layout.html.twig' %} - -{% set definition = resources.definition %} -{% set data = resources.data %} - -{% set header = configuration.vars.header|default(metadata.applicationName~'.ui.'~metadata.pluralName) %} - -{% block title %}{{ header|trans }} {{ parent() }}{% endblock %} - -{% block content %} - {{ sylius_template_event('sylius.admin.product.index.content', _context) }} -{% endblock %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/show.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/show.html.twig deleted file mode 100644 index 222d76ec61..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/show.html.twig +++ /dev/null @@ -1,11 +0,0 @@ -{% extends '@SyliusAdmin/layout.html.twig' %} - -{% block title %}{{ 'sylius.ui.show_product'|trans }} | {{ product.name }}{% endblock %} - -{% block content %} - {% if product.variants|length == 1 %} - {% include "@SyliusAdmin/Product/Show/_simpleProduct.html.twig" %} - {% else %} - {% include "@SyliusAdmin/Product/Show/_configurableProduct.html.twig" %} - {% endif %} -{% endblock %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductAssociationType/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductAssociationType/_form.html.twig deleted file mode 100644 index 4ba956087f..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductAssociationType/_form.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -{% from '@SyliusAdmin/Macro/translationForm.html.twig' import translationForm %} - -{{ form_errors(form) }} -{{ form_row(form.code) }} -{{ translationForm(form.translations) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductAttribute/Grid/Action/create.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductAttribute/Grid/Action/create.html.twig deleted file mode 100644 index 073cb5fa1b..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductAttribute/Grid/Action/create.html.twig +++ /dev/null @@ -1,12 +0,0 @@ -
      - - {{ 'sylius.ui.create'|trans }} -
      -
      - - {{ 'sylius.ui.type'|trans }} -
      -
      - {{ render(url('sylius_admin_get_attribute_types')) }} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductAttribute/Types/attributeTypes.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductAttribute/Types/attributeTypes.html.twig deleted file mode 100644 index 71d9ee47f3..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductAttribute/Types/attributeTypes.html.twig +++ /dev/null @@ -1,7 +0,0 @@ -{% for name, attributeType in types %} - {% set createRouteName = metadata.applicationName~'_admin_'~metadata.name~'_create' %} - - {% set label = 'sylius.form.attribute_type.' ~ attributeType.type %} - {{ label|trans }} - -{% endfor %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductAttribute/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductAttribute/_form.html.twig deleted file mode 100644 index 8bcb726261..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductAttribute/_form.html.twig +++ /dev/null @@ -1,21 +0,0 @@ -{% from '@SyliusAdmin/Macro/translationForm.html.twig' import translationForm %} - -{{ form_errors(form) }} - -
      -
      - {{ form_row(form.code) }} - {{ form_row(form.position) }} - {{ form_row(form.type) }} -
      - {{ form_row(form.translatable) }} -
      -{% if form.configuration is defined %} -
      -

      {{ 'sylius.ui.configuration'|trans }}

      - {% for field in form.configuration %} - {{ form_row(field) }} - {% endfor %} -
      -{% endif %} -{{ translationForm(form.translations) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductOption/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductOption/_form.html.twig deleted file mode 100644 index 8e93a5c24d..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductOption/_form.html.twig +++ /dev/null @@ -1,12 +0,0 @@ -{% from '@SyliusAdmin/Macro/translationForm.html.twig' import translationForm %} - -
      - {{ form_errors(form) }} -
      - {{ form_row(form.code) }} - {{ form_row(form.position) }} -
      - {{ translationForm(form.translations) }} -
      -

      {{ 'sylius.ui.values'|trans }}

      -{{ form_row(form.values) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductReview/Label/Status/accepted.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductReview/Label/Status/accepted.html.twig deleted file mode 100644 index 895532a778..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductReview/Label/Status/accepted.html.twig +++ /dev/null @@ -1,4 +0,0 @@ - - - {{ value|trans }} - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductReview/Label/Status/new.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductReview/Label/Status/new.html.twig deleted file mode 100644 index 2539898983..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductReview/Label/Status/new.html.twig +++ /dev/null @@ -1,4 +0,0 @@ - - - {{ value|trans }} - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductReview/Label/Status/rejected.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductReview/Label/Status/rejected.html.twig deleted file mode 100644 index 9062a2782d..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductReview/Label/Status/rejected.html.twig +++ /dev/null @@ -1,4 +0,0 @@ - - - {{ value|trans }} - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductReview/_author.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductReview/_author.html.twig deleted file mode 100644 index 74f40445c4..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductReview/_author.html.twig +++ /dev/null @@ -1 +0,0 @@ -{% include '@SyliusAdmin/Customer/_info.html.twig' with {'customer': product_review.author} %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductReview/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductReview/_form.html.twig deleted file mode 100644 index 3cbf691c4b..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductReview/_form.html.twig +++ /dev/null @@ -1,14 +0,0 @@ -
      -
      -
      - {{ form_errors(form) }} - {{ form_row(form.title) }} - {{ form_row(form.comment) }} - {{ form_row(form.rating) }} -
      -
      -
      - {% include '@SyliusAdmin/ProductReview/_product.html.twig' %} - {% include '@SyliusAdmin/ProductReview/_author.html.twig' %} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductReview/_product.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductReview/_product.html.twig deleted file mode 100644 index 2e536b548a..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductReview/_product.html.twig +++ /dev/null @@ -1,8 +0,0 @@ -{% set product = product_review.reviewSubject %} - -

      - {{ 'sylius.ui.product'|trans }} -

      -
      - {{ product.name }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Create/_breadcrumb.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Create/_breadcrumb.html.twig deleted file mode 100644 index 33997d5bb7..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Create/_breadcrumb.html.twig +++ /dev/null @@ -1,12 +0,0 @@ -{% import '@SyliusAdmin/Macro/breadcrumb.html.twig' as breadcrumb %} - -{% set breadcrumbs = [ - { label: 'sylius.ui.administration'|trans, url: path('sylius_admin_dashboard') }, - { label: 'sylius.ui.products'|trans, url: path('sylius_admin_product_index') }, - { label: resource.product.name|default(resource.product.code), url: path('sylius_admin_product_update', {'id': resource.product.id}) }, - { label: 'sylius.ui.variants'|trans, url: path(configuration.getRouteName('index'), {'productId': resource.product.id}) }, - { label: 'sylius.ui.new'|trans } - ] -%} - -{{ breadcrumb.crumble(breadcrumbs) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Create/_headerTitle.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Create/_headerTitle.html.twig deleted file mode 100644 index c12615c805..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Create/_headerTitle.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% import '@SyliusUi/Macro/headers.html.twig' as headers %} - -{{ headers.default(resource.product.name, configuration.vars.icon|default('plus'), configuration.vars.subheader|default(header)|trans) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Generate/_breadcrumb.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Generate/_breadcrumb.html.twig deleted file mode 100644 index f69da7b55f..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Generate/_breadcrumb.html.twig +++ /dev/null @@ -1,12 +0,0 @@ -{% import '@SyliusAdmin/Macro/breadcrumb.html.twig' as breadcrumb %} - -{% set breadcrumbs = [ - { label: 'sylius.ui.administration'|trans, url: path('sylius_admin_dashboard') }, - { label: 'sylius.ui.products'|trans, url: path('sylius_admin_product_index') }, - { label: product.name|default(product.code), url: path('sylius_admin_product_update', {'id': product.id}) }, - { label: 'sylius.ui.variants'|trans, url: path('sylius_admin_product_variant_index', {'productId': product.id}) }, - { label: 'sylius.ui.generate'|trans } - ] -%} - -{{ breadcrumb.crumble(breadcrumbs) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Generate/_content.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Generate/_content.html.twig deleted file mode 100644 index d3706cb7b7..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Generate/_content.html.twig +++ /dev/null @@ -1,15 +0,0 @@ -{% form_theme form '@SyliusAdmin/Form/theme.html.twig' %} - -{{ form_start(form, {'action': path('sylius_admin_product_variant_generate', {'productId': product.id}), 'attr': {'class': 'ui loadable form', 'novalidate': 'novalidate'}}) }} -
      - {% include '@SyliusAdmin/ProductVariant/Generate/_form.html.twig' %} -
      -
      - - {% include '@SyliusUi/Form/Buttons/_cancel.html.twig' with {'path': path(configuration.getRouteName('index'), {'productId': product.id})} %} -
      -
      - {{ sylius_template_event('sylius.admin.product_variant.generate.form', {'resource': resource}) }} -
      -{{ form_row(form._token) }} -{{ form_end(form, {'render_rest': false}) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Generate/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Generate/_form.html.twig deleted file mode 100644 index e9da5632aa..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Generate/_form.html.twig +++ /dev/null @@ -1,2 +0,0 @@ -

      {{ 'sylius.ui.variants'|trans }}

      -{{ form_row(form.variants) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Generate/_header.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Generate/_header.html.twig deleted file mode 100644 index 5ba128b1e6..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Generate/_header.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% import '@SyliusUi/Macro/headers.html.twig' as headers %} - -{{ headers.default(product.name, 'random', configuration.vars.subheader|default(header)|trans) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Grid/Action/updatePositions.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Grid/Action/updatePositions.html.twig deleted file mode 100644 index 85812dc1ff..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Grid/Action/updatePositions.html.twig +++ /dev/null @@ -1,6 +0,0 @@ -
      - -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Grid/Field/inventory.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Grid/Field/inventory.html.twig deleted file mode 100644 index be7507b9e2..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Grid/Field/inventory.html.twig +++ /dev/null @@ -1,16 +0,0 @@ -{% if data.isTracked %} -
      - - {{ data.onHand }} {{ 'sylius.ui.available_on_hand'|trans }} - {% if data.onHold > 0 %} -
      - {{ data.onHold }} {{ 'sylius.ui.reserved'|trans }} -
      - {% endif %} -
      -{% else %} - - - {{ 'sylius.ui.not_tracked'|trans }} - -{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Grid/Field/name.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Grid/Field/name.html.twig deleted file mode 100644 index 70d27b00e7..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Grid/Field/name.html.twig +++ /dev/null @@ -1,26 +0,0 @@ -{% set current_locale = sylius.localeCode %} -{% set translation = data.getTranslation(current_locale) %} -{% set translation = translation.locale == current_locale ? translation : null %} - -{% if data.optionValues is empty %} - {% if translation is not null and translation.name is not null %} - - {{ translation.name }} - - {% else %} - {% include '@SyliusAdmin/Common/_missingTranslation.html.twig' %} - {% endif %} -{% else %} - - {% set product = data.product %} - {{ translation is not null and translation.name is not null ? translation.name : product.name }} - -
      -
      - {% for optionValue in data.optionValues %} -
      - {{ optionValue.value }} -
      - {% endfor %} -
      -{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Grid/Field/position.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Grid/Field/position.html.twig deleted file mode 100644 index 9d49c15792..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Grid/Field/position.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -
      -
      - -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Index/ProductHeader/_breadcrumb.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Index/ProductHeader/_breadcrumb.html.twig deleted file mode 100644 index 2c6b52a90c..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Index/ProductHeader/_breadcrumb.html.twig +++ /dev/null @@ -1 +0,0 @@ -{% include configuration.vars.templates.breadcrumb|default('@SyliusAdmin/ProductVariant/Index/_breadcrumb.html.twig') %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Index/ProductHeader/_content.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Index/ProductHeader/_content.html.twig deleted file mode 100644 index 37d1aa60a7..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Index/ProductHeader/_content.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% import '@SyliusUi/Macro/headers.html.twig' as headers %} - -{{ headers.default(product.name, configuration.vars.icon|default('cubes'), configuration.vars.subheader|default('sylius.ui.manage_variants')|trans) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Index/_breadcrumb.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Index/_breadcrumb.html.twig deleted file mode 100644 index 2e2879786c..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Index/_breadcrumb.html.twig +++ /dev/null @@ -1,11 +0,0 @@ -{% import '@SyliusAdmin/Macro/breadcrumb.html.twig' as breadcrumb %} - -{% set breadcrumbs = [ - { label: 'sylius.ui.administration'|trans, url: path('sylius_admin_dashboard') }, - { label: 'sylius.ui.products'|trans, url: path('sylius_admin_product_index') }, - { label: product.name|default(product.code), url: path('sylius_admin_product_update', {'id': product.id}) }, - { label: 'sylius.ui.variants'|trans }, - ] -%} - -{{ breadcrumb.crumble(breadcrumbs) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Index/_header.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Index/_header.html.twig deleted file mode 100644 index 87fd67559a..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Index/_header.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -{{ render(url('sylius_admin_partial_product_show', { - 'id': app.request.attributes.get('productId'), - 'template': '@SyliusAdmin/ProductVariant/Index/_productHeader.html.twig', - 'vars': configuration.vars -})) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Index/_headerWidget.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Index/_headerWidget.html.twig deleted file mode 100644 index 91a4b97019..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Index/_headerWidget.html.twig +++ /dev/null @@ -1,4 +0,0 @@ -
      - {% include '@SyliusAdmin/ProductVariant/Index/_header.html.twig' %} - {% include '@SyliusAdmin/Crud/Index/_actions.html.twig' %} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Index/_productHeader.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Index/_productHeader.html.twig deleted file mode 100644 index 4ab37d09f7..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Index/_productHeader.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -
      - {{ sylius_template_event('sylius.admin.product_variant.index.header.content', _context) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Tab/_channelPricings.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Tab/_channelPricings.html.twig deleted file mode 100644 index 5b4aa7bd43..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Tab/_channelPricings.html.twig +++ /dev/null @@ -1,30 +0,0 @@ -
      -

      {{ 'sylius.ui.channel_pricings'|trans }}

      -
      - {{ 'sylius.ui.price_details'|trans }} -
      - {{ 'sylius.ui.original_price_details'|trans }} -
      - {{ 'sylius.ui.minimum_price_details'|trans }} -
      -
      - {{ form_errors(form.channelPricings) }} - {% for channelCode, channelPricing in form.channelPricings %} -
      -
      - {{ channelPricing.vars.label }} -
      - {% if channelCode not in product_variant.product.channels|map(channel => channel.code) %} -
      - {{ 'sylius.ui.product.product_not_active_in_channel'|trans }} -
      - {% endif %} - {{ form_row(channelPricing.price) }} - {{ form_row(channelPricing.originalPrice) }} - {{ form_row(channelPricing.minimumPrice) }} -
      - {% endfor %} -
      - - {{ sylius_template_event(['sylius.admin.product_variant.' ~ action ~ '.tab_channel_pricings', 'sylius.admin.product_variant.channelPricings'], {'form': form}) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Tab/_details.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Tab/_details.html.twig deleted file mode 100644 index c019c97757..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Tab/_details.html.twig +++ /dev/null @@ -1,42 +0,0 @@ -{% from '@SyliusAdmin/Macro/translationForm.html.twig' import translationForm %} - -
      -

      {{ 'sylius.ui.details'|trans }}

      - -
      - {{ translationForm(form.translations) }} - -
      - {{ form_row(form.code) }} - {{ form_row(form.enabled) }} -
      - -
      -
      - {{ form_row(form.shippingCategory) }} -
      -
      - {{ form_row(form.shippingRequired) }} -
      -
      - {% if form.optionValues is defined and form.optionValues|length > 0 %} - -
      -

      {{ 'sylius.ui.options'|trans }}

      - {% for option_form in form.optionValues %} - {{ form_row(option_form) }} - {% endfor %} -
      - {% endif %} - -
      -

      {{ 'sylius.ui.properties'|trans }}

      - {{ form_row(form.height) }} - {{ form_row(form.width) }} - {{ form_row(form.depth) }} - {{ form_row(form.weight) }} -
      -
      - - {{ sylius_template_event(['sylius.admin.product_variant.' ~ action ~ '.tab_details', 'sylius.admin.product_variant.tab_details'], {'form': form}) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Tab/_inventory.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Tab/_inventory.html.twig deleted file mode 100644 index e1784fee8b..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Tab/_inventory.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -
      - {{ sylius_template_event('sylius.admin.product_variant.tab_inventory_content', _context) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Tab/_inventoryContent.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Tab/_inventoryContent.html.twig deleted file mode 100644 index 65576cfc3c..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Tab/_inventoryContent.html.twig +++ /dev/null @@ -1,13 +0,0 @@ -

      {{ 'sylius.ui.inventory'|trans }}

      -
      - {{ form_row(form.onHand) }} - {{ form_row(form.tracked) }} - -
      - {{ form_help(form.tracked) }} -
      - - {{ form_row(form.version) }} -
      - -{{ sylius_template_event(['sylius.admin.product_variant.' ~ action ~ '.tab_inventory', 'sylius.admin.product_variant.tab_inventory'], {'form': form}) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Tab/_taxes.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Tab/_taxes.html.twig deleted file mode 100644 index 7517bdaa21..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Tab/_taxes.html.twig +++ /dev/null @@ -1,6 +0,0 @@ -
      -

      {{ 'sylius.ui.taxes'|trans }}

      - {{ form_row(form.taxCategory) }} - - {{ sylius_template_event(['sylius.admin.product_variant.' ~ action ~ '.tab_taxes', 'sylius.admin.product_variant.tab_taxes'], {'form': form}) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Update/_breadcrumb.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Update/_breadcrumb.html.twig deleted file mode 100644 index 8b772535bb..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Update/_breadcrumb.html.twig +++ /dev/null @@ -1,13 +0,0 @@ -{% import '@SyliusAdmin/Macro/breadcrumb.html.twig' as breadcrumb %} - -{% set breadcrumbs = [ - { label: 'sylius.ui.administration'|trans, url: path('sylius_admin_dashboard') }, - { label: 'sylius.ui.products'|trans, url: path('sylius_admin_product_index') }, - { label: resource.product.name, url: path('sylius_admin_product_update', {'id': resource.product.id}) }, - { label: 'sylius.ui.variants'|trans, url: path('sylius_admin_product_variant_index', {'productId': resource.product.id}) }, - { label: resource.name|default(resource.code) }, - { label: 'sylius.ui.edit'|trans } - ] -%} - -{{ breadcrumb.crumble(breadcrumbs) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Update/_toolbar.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Update/_toolbar.html.twig deleted file mode 100644 index 70e4776e15..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/Update/_toolbar.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -
      -
      - {% include '@SyliusAdmin/Product/_showInShopButton.html.twig' with {'product': product_variant.product} %} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/_form.html.twig deleted file mode 100644 index 6dc8c9bd0a..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/_form.html.twig +++ /dev/null @@ -1,2 +0,0 @@ -{% set menu = knp_menu_get('sylius.admin.product_variant_form', [], {'product_variant': product_variant}) %} -{{ knp_menu_render(menu, {'template': '@SyliusAdmin/ProductVariant/_menu.html.twig', 'form': form, 'product_variant': product_variant}) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/_menu.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/_menu.html.twig deleted file mode 100644 index 651c3163c9..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/_menu.html.twig +++ /dev/null @@ -1,40 +0,0 @@ -{% extends 'knp_menu.html.twig' %} - -{% if 'create' in app.request.attributes.get('_route') %} - {% set action = 'create' %} -{% else %} - {% set action = 'update' %} -{% endif %} - -{% block list %} -{% set form = (options.form) %} -
      -
      -
      - {% for item in item.children %} - {{ block('item') }} - {% endfor %} -
      -
      -
      - {{ form_errors(form) }} -
      - {% for item in item.children %} - {% include item.attribute('template') with {'form': form, 'product_variant': options.product_variant} %} - {% endfor %} -
      -
      -
      -{% endblock %} - -{% block item %} - {%- set attributes = item.attributes %} - {%- set classes = item.attribute('class') is not empty ? [item.attribute('class')] : [] %} - {%- if item.actsLikeFirst %} - {%- set classes = classes|merge(['active']) %} - {%- endif %} - {%- if classes is not empty %} - {%- set attributes = attributes|merge({'class': classes|join(' ')}) %} - {%- endif %} - {{ item.label|trans }} -{% endblock %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/generate.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/generate.html.twig deleted file mode 100644 index fd56d23021..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/generate.html.twig +++ /dev/null @@ -1,9 +0,0 @@ -{% extends '@SyliusAdmin/layout.html.twig' %} - -{% set header = 'sylius.ui.generate_variants' %} - -{% block title %}{{ header|trans }} {{ parent() }}{% endblock %} - -{% block content %} - {{ sylius_template_event('sylius.admin.product_variant.generate.content', _context) }} -{% endblock %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/index.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/index.html.twig deleted file mode 100644 index a463a3afdf..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ProductVariant/index.html.twig +++ /dev/null @@ -1,14 +0,0 @@ -{% extends '@SyliusAdmin/layout.html.twig' %} - -{% import '@SyliusUi/Macro/headers.html.twig' as headers %} - -{% set definition = resources.definition %} -{% set data = resources.data %} - -{% set header = configuration.vars.header|default(metadata.applicationName~'.ui.'~metadata.pluralName) %} - -{% block title %}{{ header|trans }} {{ parent() }}{% endblock %} - -{% block content %} - {{ sylius_template_event('sylius.admin.product_variant.index.content', _context) }} -{% endblock %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Promotion/Grid/Field/codeExclusiveAndCouponBased.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Promotion/Grid/Field/codeExclusiveAndCouponBased.html.twig deleted file mode 100644 index ec2a9c1ff7..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Promotion/Grid/Field/codeExclusiveAndCouponBased.html.twig +++ /dev/null @@ -1,9 +0,0 @@ -{% if data.exclusive %} -
      {{ 'sylius.ui.exclusive'|trans }}
      -
      -{% endif %} -{% if data.couponBased %} -
      {{ 'sylius.ui.coupon_based'|trans }}
      -
      -{% endif %} -{{ data.code }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Promotion/Grid/Field/usage.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Promotion/Grid/Field/usage.html.twig deleted file mode 100644 index 959712c5e2..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Promotion/Grid/Field/usage.html.twig +++ /dev/null @@ -1,22 +0,0 @@ -{% if data.usageLimit is empty %} - - {{ data.used }} - - / - ∞ -{% else %} - {% set color = 'teal' %} - - {% if data.used == data.usageLimit %} - {% set color = 'red' %} - {% elseif data.used > data.usageLimit/2 %} - {% set color = 'yellow' %} - {% endif %} - - {{ data.used }} - - / - - {{ data.usageLimit }} - -{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Promotion/Grid/Field/usedWithUsageLimit.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Promotion/Grid/Field/usedWithUsageLimit.html.twig deleted file mode 100644 index 0b405d25c7..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Promotion/Grid/Field/usedWithUsageLimit.html.twig +++ /dev/null @@ -1,6 +0,0 @@ -
      - {{ data.used }} - {% if data.usageLimit %} - /{{ data.usageLimit }} - {% endif %} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Promotion/Show/_translations.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Promotion/Show/_translations.html.twig deleted file mode 100644 index 1d807ef960..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Promotion/Show/_translations.html.twig +++ /dev/null @@ -1,21 +0,0 @@ - - -
      - {% for translation in promotion.translations %} -
      - - - {{ translation.locale|sylius_locale_name }} -
      -
      - - - - - - - -
      {{ 'sylius.ui.label'|trans }}{{ translation.label }}
      -
      - {% endfor %} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Promotion/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Promotion/_form.html.twig deleted file mode 100644 index 6180553ad0..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Promotion/_form.html.twig +++ /dev/null @@ -1,53 +0,0 @@ -{% from '@SyliusAdmin/Macro/translationForm.html.twig' import translationForm %} - -
      -
      - {{ form_errors(form) }} -
      -
      - {{ form_row(form.code) }} - {{ form_row(form.name) }} -
      - {{ form_row(form.description) }} -
      -
      -
      -
      -
      - {{ form_row(form.usageLimit) }} - {{ form_row(form.couponBased) }} - {{ form_row(form.exclusive) }} -
      - {{ form_widget(form.appliesToDiscounted) }} - {{ form_label(form.appliesToDiscounted) }} - {{ 'sylius.form.promotion.applies_to_discounted_details'|trans }} -
      -
      -
      - {{ form_row(form.priority) }} - {{ form_row(form.channels) }} -
      -
      -

      {{ 'sylius.ui.start_date'|trans }} & {{ 'sylius.ui.end_date'|trans }}

      - -
      - {{ form_row(form.startsAt) }} - {{ form_row(form.endsAt) }} -
      -
      -
      -
      - {{ translationForm(form.translations) }} -
      -
      -

      {{ 'sylius.ui.configuration'|trans }}

      - -
      -
      - {{ form_row(form.rules) }} -
      -
      - {{ form_row(form.actions) }} -
      -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Promotion/_toolbar.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Promotion/_toolbar.html.twig deleted file mode 100644 index 831b8e68e9..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Promotion/_toolbar.html.twig +++ /dev/null @@ -1,7 +0,0 @@ -{% set menu = knp_menu_get('sylius.admin.promotion.update', [], {'promotion': promotion}) %} - -{% if promotion.couponBased == true %} -
      - {{ knp_menu_render(menu, {'template': '@SyliusUi/Menu/top.html.twig'}) }} -
      -{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/Create/_breadcrumb.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/Create/_breadcrumb.html.twig deleted file mode 100644 index 6c7a35bd5a..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/Create/_breadcrumb.html.twig +++ /dev/null @@ -1,12 +0,0 @@ -{% import '@SyliusAdmin/Macro/breadcrumb.html.twig' as breadcrumb %} - -{% set breadcrumbs = [ - { label: 'sylius.ui.administration'|trans, url: path('sylius_admin_dashboard') }, - { label: 'sylius.ui.promotions'|trans, url: path('sylius_admin_promotion_index') }, - { label: resource.promotion.name|default(resource.promotion.code), url: path('sylius_admin_promotion_update', {'id': resource.promotion.id}) }, - { label: 'sylius.ui.coupons'|trans, url: path(configuration.getRouteName('index'), {'promotionId': resource.promotion.id}) }, - { label: 'sylius.ui.new'|trans } - ] -%} - -{{ breadcrumb.crumble(breadcrumbs) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/Create/_headerTitle.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/Create/_headerTitle.html.twig deleted file mode 100644 index d2bcc5306b..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/Create/_headerTitle.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% import '@SyliusUi/Macro/headers.html.twig' as headers %} - -{{ headers.default(resource.promotion.name, configuration.vars.icon|default('plus'), configuration.vars.subheader|default(header)|trans) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/Generate/_breadcrumb.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/Generate/_breadcrumb.html.twig deleted file mode 100644 index b2b27e8059..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/Generate/_breadcrumb.html.twig +++ /dev/null @@ -1,12 +0,0 @@ -{% import '@SyliusAdmin/Macro/breadcrumb.html.twig' as breadcrumb %} - -{% set breadcrumbs = [ - { label: 'sylius.ui.administration'|trans, url: path('sylius_admin_dashboard') }, - { label: 'sylius.ui.promotions'|trans, url: path('sylius_admin_promotion_index') }, - { label: promotion.name|default(promotion.code), url: path('sylius_admin_promotion_update', {'id': promotion.id}) }, - { label: 'sylius.ui.coupons'|trans, url: path('sylius_admin_promotion_coupon_index', {'promotionId': promotion.id}) }, - { label: 'sylius.ui.generate'|trans } - ] -%} - -{{ breadcrumb.crumble(breadcrumbs) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/Generate/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/Generate/_form.html.twig deleted file mode 100644 index e48a4ad2f2..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/Generate/_form.html.twig +++ /dev/null @@ -1,28 +0,0 @@ -
      -
      -
      -
      - {{ form_row(form.prefix) }} - {{ form_row(form.codeLength) }} - {{ form_row(form.suffix) }} -
      -
      -
      -
      -
      -
      -
      - {{ form_errors(form) }} - {{ form_row(form.amount) }} -
      -
      -
      -
      -

      {{ 'sylius.ui.expiration_and_usage_limits'|trans }}

      -
      - {{ form_row(form.expiresAt) }} - {{ form_row(form.usageLimit) }} -
      -
      -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/Generate/_formWidget.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/Generate/_formWidget.html.twig deleted file mode 100644 index 1dce7deb8a..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/Generate/_formWidget.html.twig +++ /dev/null @@ -1,16 +0,0 @@ -{% form_theme form '@SyliusAdmin/Form/theme.html.twig' %} - -{{ form_start(form, {'action': path('sylius_admin_promotion_coupon_generate', {'promotionId': promotion.id}), 'attr': {'class': 'ui loadable form', 'novalidate': 'novalidate'}}) }} -
      - {% include '@SyliusAdmin/PromotionCoupon/Generate/_form.html.twig' %} -
      -
      - - {% include '@SyliusUi/Form/Buttons/_cancel.html.twig' with {'path': path(configuration.getRouteName('index'), {'promotionId': promotion.id})} %} -
      -
      - - {{ sylius_template_event('sylius.admin.promotion_coupon.generate.form', {'resource': promotion}) }} -
      -{{ form_row(form._token) }} -{{ form_end(form, {'render_rest': false}) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/Generate/_header.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/Generate/_header.html.twig deleted file mode 100644 index 587482c2cf..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/Generate/_header.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% import '@SyliusUi/Macro/headers.html.twig' as headers %} - -{{ headers.default(promotion.name, 'random', configuration.vars.subheader|default(header)|trans) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/Index/_breadcrumb.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/Index/_breadcrumb.html.twig deleted file mode 100644 index 40b51d40fa..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/Index/_breadcrumb.html.twig +++ /dev/null @@ -1,11 +0,0 @@ -{% import '@SyliusAdmin/Macro/breadcrumb.html.twig' as breadcrumb %} - -{% set breadcrumbs = [ - { label: 'sylius.ui.administration'|trans, url: path('sylius_admin_dashboard') }, - { label: 'sylius.ui.promotions'|trans, url: path('sylius_admin_promotion_index') }, - { label: promotion.name|default(promotion.code), url: path('sylius_admin_promotion_update', {'id': promotion.id}) }, - { label: 'sylius.ui.coupons'|trans }, - ] -%} - -{{ breadcrumb.crumble(breadcrumbs) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/Index/_header.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/Index/_header.html.twig deleted file mode 100644 index c2348b12bd..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/Index/_header.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -{{ render(url('sylius_admin_partial_promotion_show', { - 'id': app.request.attributes.get('promotionId'), - 'template': '@SyliusAdmin/PromotionCoupon/Index/_promotionHeader.html.twig', - 'vars': configuration.vars -})) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/Index/_headerWidget.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/Index/_headerWidget.html.twig deleted file mode 100644 index eab086661d..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/Index/_headerWidget.html.twig +++ /dev/null @@ -1,4 +0,0 @@ -
      - {% include '@SyliusAdmin/PromotionCoupon/Index/_header.html.twig' %} - {% include '@SyliusAdmin/Crud/Index/_actions.html.twig' %} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/Index/_promotionHeader.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/Index/_promotionHeader.html.twig deleted file mode 100644 index 08b5209ebc..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/Index/_promotionHeader.html.twig +++ /dev/null @@ -1,7 +0,0 @@ -{% import '@SyliusUi/Macro/headers.html.twig' as headers %} - -
      - {{ headers.default(promotion.name, configuration.vars.icon|default('tags'), configuration.vars.subheader|default('sylius.ui.manage_coupons')|trans) }} - - {% include configuration.vars.templates.breadcrumb|default('@SyliusAdmin/PromotionCoupon/Index/_breadcrumb.html.twig') %} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/Update/_breadcrumb.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/Update/_breadcrumb.html.twig deleted file mode 100644 index 8fd6c4412f..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/Update/_breadcrumb.html.twig +++ /dev/null @@ -1,13 +0,0 @@ -{% import '@SyliusAdmin/Macro/breadcrumb.html.twig' as breadcrumb %} - -{% set breadcrumbs = [ - { label: 'sylius.ui.administration'|trans, url: path('sylius_admin_dashboard') }, - { label: 'sylius.ui.promotions'|trans, url: path('sylius_admin_promotion_index') }, - { label: resource.promotion.name, url: path('sylius_admin_promotion_update', {'id': resource.promotion.id}) }, - { label: 'sylius.ui.promotion_coupons'|trans, url: path('sylius_admin_promotion_coupon_index', {'promotionId': resource.promotion.id}) }, - { label: resource.code|default(resource.id) }, - { label: 'sylius.ui.edit'|trans } - ] -%} - -{{ breadcrumb.crumble(breadcrumbs) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/_form.html.twig deleted file mode 100644 index f03a0b2e86..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/_form.html.twig +++ /dev/null @@ -1,15 +0,0 @@ -
      - {{ form_errors(form) }} - {{ form_row(form.code) }} -
      -
      -

      {{ 'sylius.ui.expiration_and_usage_limits'|trans }}

      -
      - {{ form_row(form.usageLimit) }} - {{ form_row(form.perCustomerUsageLimit) }} -
      -
      - {{ form_row(form.reusableFromCancelledOrders) }} - {{ form_row(form.expiresAt) }} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/generate.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/generate.html.twig deleted file mode 100644 index 3cc8bff6b6..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/generate.html.twig +++ /dev/null @@ -1,9 +0,0 @@ -{% extends '@SyliusAdmin/layout.html.twig' %} - -{% set header = 'sylius.ui.generate_coupons' %} - -{% block title %}{{ header|trans }} {{ parent() }}{% endblock %} - -{% block content %} - {{ sylius_template_event('sylius.admin.promotion_coupon.generate.content', _context) }} -{% endblock %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/index.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/index.html.twig deleted file mode 100644 index c23ddf84c5..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/PromotionCoupon/index.html.twig +++ /dev/null @@ -1,14 +0,0 @@ -{% extends '@SyliusAdmin/layout.html.twig' %} - -{% import '@SyliusUi/Macro/headers.html.twig' as headers %} - -{% set definition = resources.definition %} -{% set data = resources.data %} - -{% set header = configuration.vars.header|default(metadata.applicationName~'.ui.'~metadata.pluralName) %} - -{% block title %}{{ header|trans }} {{ parent() }}{% endblock %} - -{% block content %} - {{ sylius_template_event('sylius.admin.promotion_coupon.index.content', _context) }} -{% endblock %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Security/Form/_requestPasswordResetButton.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Security/Form/_requestPasswordResetButton.html.twig deleted file mode 100644 index f12d85838a..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Security/Form/_requestPasswordResetButton.html.twig +++ /dev/null @@ -1,3 +0,0 @@ - - {{ 'sylius.ui.forgot_password'|trans }} - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Security/RequestPasswordReset/_email.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Security/RequestPasswordReset/_email.html.twig deleted file mode 100644 index 66ddd9e922..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Security/RequestPasswordReset/_email.html.twig +++ /dev/null @@ -1 +0,0 @@ -{{ form_row(form.email, sylius_test_form_attribute('email')) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Security/RequestPasswordReset/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Security/RequestPasswordReset/_form.html.twig deleted file mode 100644 index ac24b870fe..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Security/RequestPasswordReset/_form.html.twig +++ /dev/null @@ -1,17 +0,0 @@ -{% form_theme form '@SyliusUi/Form/theme.html.twig' %} - -
      -
      - {{ sylius_template_event('sylius.admin.request_password_reset.before_form') }} - - {{ form_start(form, {action: path('sylius_admin_request_password_reset'), 'attr': {'class': 'ui large loadable form', 'novalidate': 'novalidate'}}) }} - -
      - {{ sylius_template_event('sylius.admin.request_password_reset.form.content', _context) }} -
      - {{ form_row(form._token) }} - {{ form_end(form, {'render_rest': false}) }} - - {{ sylius_template_event('sylius.admin.request_password_reset.after_form') }} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Security/RequestPasswordReset/_submit.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Security/RequestPasswordReset/_submit.html.twig deleted file mode 100644 index da6446a138..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Security/RequestPasswordReset/_submit.html.twig +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Security/ResetPassword/Form/_passwords.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Security/ResetPassword/Form/_passwords.html.twig deleted file mode 100644 index ab883cac32..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Security/ResetPassword/Form/_passwords.html.twig +++ /dev/null @@ -1,2 +0,0 @@ -{{ form_row(form.password.newPassword, sylius_test_form_attribute('new-password')) }} -{{ form_row(form.password.confirmNewPassword, sylius_test_form_attribute('confirm-new-password')) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Security/ResetPassword/Form/_submit.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Security/ResetPassword/Form/_submit.html.twig deleted file mode 100644 index ad540447bb..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Security/ResetPassword/Form/_submit.html.twig +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Security/ResetPassword/_content.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Security/ResetPassword/_content.html.twig deleted file mode 100644 index c29e7b8157..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Security/ResetPassword/_content.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -
      -
      - {{ sylius_template_event('sylius.admin.reset_password.form', _context) }} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Security/ResetPassword/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Security/ResetPassword/_form.html.twig deleted file mode 100644 index d56c235c5c..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Security/ResetPassword/_form.html.twig +++ /dev/null @@ -1,8 +0,0 @@ -{% form_theme form '@SyliusAdmin/Form/theme.html.twig' %} - -{{ form_start(form, {action: path('sylius_admin_password_reset', {'token': app.request.attributes.get('token')}), 'attr': {'class': 'ui large loadable form', 'novalidate': 'novalidate'}}) }} -
      - {{ sylius_template_event('sylius.admin.reset_password.form.content', _context) }} -
      - {{ form_row(form._token) }} -{{ form_end(form, {'render_rest': false}) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Field/boolean.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Field/boolean.html.twig new file mode 100644 index 0000000000..abb518de17 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Field/boolean.html.twig @@ -0,0 +1,7 @@ +{% from '@SyliusAdmin/Shared/Helper/icon.html.twig' import icon as _icon %} + +{% if true == data %} + {{ _icon({ icon: 'check', class: 'icon text-green' }) }} +{% else %} + {{ _icon({ icon: 'x', class: 'icon icon-sm text-secondary' }) }} +{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Common/Macro/money.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/money.html.twig similarity index 100% rename from src/Sylius/Bundle/AdminBundle/Resources/views/Common/Macro/money.html.twig rename to src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/money.html.twig diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/Grid/Action/_shipWithTrackingCodeContent.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/Grid/Action/_shipWithTrackingCodeContent.html.twig deleted file mode 100644 index 88e258115e..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/Grid/Action/_shipWithTrackingCodeContent.html.twig +++ /dev/null @@ -1,30 +0,0 @@ -{% if sm_can(data, 'ship', 'sylius_shipment') %} - {{ render(controller('sylius.controller.shipment::updateAction', { - '_sylius': { - 'event': 'ship', - 'repository': { - 'method': 'findOneByOrderId', - 'arguments': { - 'id': data.id, - 'orderId': data.order.id - } - }, - 'state_machine': { - 'graph': 'sylius_shipment', - 'transition': 'ship' - }, - 'section': 'admin', - 'permission': true, - 'template': '@SyliusAdmin/Shipment/Grid/_ship.html.twig', - 'form': 'Sylius\\Bundle\\ShippingBundle\\Form\\Type\\ShipmentShipType', - 'vars': { - 'route': { - 'parameters': { - 'id': data.id, - 'orderId': data.order.id - } - } - } - } - })) }} -{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/Grid/Action/shipWithTrackingCode.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/Grid/Action/shipWithTrackingCode.html.twig deleted file mode 100644 index c3a7cc8a94..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/Grid/Action/shipWithTrackingCode.html.twig +++ /dev/null @@ -1 +0,0 @@ -{{ sylius_template_event('sylius.admin.shipment.ship_with_tracking_code', _context) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/Grid/_ship.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/Grid/_ship.html.twig deleted file mode 100644 index a16d3ffa40..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/Grid/_ship.html.twig +++ /dev/null @@ -1 +0,0 @@ -{{ sylius_template_event('sylius.admin.shipment.grid.ship', _context) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/Grid/_shipContent.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/Grid/_shipContent.html.twig deleted file mode 100644 index 616a01cb85..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/Grid/_shipContent.html.twig +++ /dev/null @@ -1,8 +0,0 @@ -{{ form_start(form, {'action': path('sylius_admin_shipment_ship', configuration.vars.route.parameters), 'attr': {'class': 'ui loadable form', 'novalidate': 'novalidate'}}) }} - -
      - {{ form_widget(form.tracking, {'attr': {'placeholder': 'sylius.ui.tracking_code'|trans ~ '...'}}) }} - -
      -{{ form_row(form._token) }} -{{ form_end(form, {'render_rest': false}) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/Partial/_ship.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/Partial/_ship.html.twig deleted file mode 100644 index e5649a2ebd..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/Partial/_ship.html.twig +++ /dev/null @@ -1 +0,0 @@ -{{ sylius_template_event('sylius.admin.shipment.partial.ship', _context) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/Partial/_shipContent.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/Partial/_shipContent.html.twig deleted file mode 100644 index a1fcd93bf2..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/Partial/_shipContent.html.twig +++ /dev/null @@ -1,10 +0,0 @@ -
      - {{ form_start(form, {'action': path('sylius_admin_order_shipment_ship', configuration.vars.route.parameters), 'attr': {'class': 'ui loadable form', 'novalidate': 'novalidate'}}) }} - -
      - {{ form_widget(form.tracking, {'attr': {'placeholder': 'sylius.ui.tracking_code'|trans ~ '...'}}) }} - -
      - {{ form_row(form._token) }} - {{ form_end(form, {'render_rest': false}) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/Show/_breadcrumb.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/Show/_breadcrumb.html.twig deleted file mode 100644 index a1dbd0689b..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/Show/_breadcrumb.html.twig +++ /dev/null @@ -1,12 +0,0 @@ -{% import '@SyliusAdmin/Macro/breadcrumb.html.twig' as breadcrumb %} - -{% set breadcrumbs = [ - { label: 'sylius.ui.administration'|trans, url: path('sylius_admin_dashboard') }, - { label: 'sylius.ui.orders'|trans, url: path('sylius_admin_order_index') }, - { label: '#' ~ shipment.order.number, url: path('sylius_admin_order_show', {'id': shipment.order.id}) }, - { label: 'sylius.ui.shipments'|trans}, - { label: shipment.id } -] -%} - -{{ breadcrumb.crumble(breadcrumbs) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/Show/_header.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/Show/_header.html.twig deleted file mode 100644 index f4c965b2b2..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/Show/_header.html.twig +++ /dev/null @@ -1,13 +0,0 @@ -

      - -
      - {{ 'sylius.ui.shipment_for_order'|trans }} #{{ shipment.order.number }} -
      -
      -
      - {% include '@SyliusAdmin/Common/Label/shipmentState.html.twig' with {'data': shipment.state} %} -
      -
      -
      -
      -

      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/Show/_headerWidget.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/Show/_headerWidget.html.twig deleted file mode 100644 index 80093d6e77..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/Show/_headerWidget.html.twig +++ /dev/null @@ -1,10 +0,0 @@ -{% import '@SyliusUi/Macro/buttons.html.twig' as buttons %} - -
      -
      - {% include '@SyliusAdmin/Shipment/Show/_header.html.twig' %} -
      -
      - {{ buttons.default(app.request.headers.get('referer'), '', 'back', 'arrow alternate circle left outline') }} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/Show/_shipmentUnits.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/Show/_shipmentUnits.html.twig deleted file mode 100644 index 4661b26304..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/Show/_shipmentUnits.html.twig +++ /dev/null @@ -1,18 +0,0 @@ -
      - - - - - - - - - {% for unit in shipment.units %} - - - - - {% endfor %} - -
      {{ 'sylius.ui.product'|trans }}{{ 'sylius.ui.variant'|trans }}
      {{ unit.orderItem.product.name }}{{ unit.orderItem.variant.name }}
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/show.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/show.html.twig deleted file mode 100644 index d92581bbe4..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/show.html.twig +++ /dev/null @@ -1,7 +0,0 @@ -{% extends '@SyliusAdmin/layout.html.twig' %} - -{% block title %}{{ 'sylius.ui.shipment'|trans }} | {{ shipment.id }}{% endblock %} - -{% block content %} - {{ sylius_template_event('sylius.admin.shipment.show.content', _context) }} -{% endblock %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ShippingCategory/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ShippingCategory/_form.html.twig deleted file mode 100644 index bc6e1245bf..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ShippingCategory/_form.html.twig +++ /dev/null @@ -1,16 +0,0 @@ -
      -
      -
      - {{ form_errors(form) }} -
      - {{ form_row(form.code) }} - {{ form_row(form.name) }} -
      -
      -
      -
      -
      - {{ form_row(form.description) }} -
      -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ShippingMethod/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ShippingMethod/_form.html.twig deleted file mode 100644 index 7b353d14c4..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ShippingMethod/_form.html.twig +++ /dev/null @@ -1,44 +0,0 @@ -{% from '@SyliusAdmin/Macro/translationForm.html.twig' import translationForm %} - -
      -
      -
      - {{ form_errors(form) }} -
      - {{ form_row(form.code) }} - {{ form_row(form.zone) }} - {{ form_row(form.position) }} -
      - {{ form_row(form.enabled) }} -

      {{ 'sylius.ui.availability'|trans }}

      - {{ form_row(form.channels) }} -

      {{ 'sylius.ui.category_requirements'|trans }}

      - {{ form_row(form.category) }} - {% for categoryRequirementChoiceForm in form.categoryRequirement %} - {{ form_row(categoryRequirementChoiceForm) }} - {% endfor %} -

      {{ 'sylius.ui.taxes'|trans }}

      - {{ form_row(form.taxCategory) }} -

      {{ 'sylius.ui.shipping_charges'|trans }}

      - {{ form_row(form.calculator) }} - {% for name, calculatorConfigurationPrototype in form.vars.prototypes %} -
      -
      - {% endfor %} -
      - {% if form.configuration is defined %} - {{ form_widget(form.configuration) }} - {% endif %} -
      - -

      {{ 'sylius.ui.rules'|trans }}

      -
      - {% include '@SyliusAdmin/ShippingMethod/_rules.html.twig' %} -
      -
      -
      -
      - {{ translationForm(form.translations) }} -
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/ShippingMethod/_rules.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/ShippingMethod/_rules.html.twig deleted file mode 100644 index 5f16afcd33..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/ShippingMethod/_rules.html.twig +++ /dev/null @@ -1,7 +0,0 @@ -
      - -
      - {{ 'sylius.form.shipping_method.rules_help'|trans }} -
      -
      -{{ form_row(form.rules) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/TaxCategory/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/TaxCategory/_form.html.twig deleted file mode 100644 index c12ca90e1a..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/TaxCategory/_form.html.twig +++ /dev/null @@ -1,6 +0,0 @@ -{{ form_errors(form) }} -
      - {{ form_row(form.code) }} - {{ form_row(form.name) }} -
      -{{ form_row(form.description) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/TaxRate/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/TaxRate/_form.html.twig deleted file mode 100644 index 8acce72ae8..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/TaxRate/_form.html.twig +++ /dev/null @@ -1,32 +0,0 @@ -{{ form_errors(form) }} - -
      -

      {{ 'sylius.ui.general_info'|trans }}

      -
      - {{ form_row(form.code) }} - {{ form_row(form.name) }} -
      -
      - -
      -

      {{ 'sylius.ui.criteria'|trans }}

      -
      - {{ form_row(form.category) }} - {{ form_row(form.zone) }} -
      -
      - -
      -

      {{ 'sylius.ui.date_range'|trans }}

      -
      - {{ form_row(form.startDate) }} - {{ form_row(form.endDate) }} -
      -
      - -
      -

      {{ 'sylius.ui.taxes'|trans }}

      - {{ form_row(form.calculator) }} - {{ form_row(form.amount) }} - {{ form_row(form.includedInPrice) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/_form.html.twig deleted file mode 100644 index 1156402a4d..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/_form.html.twig +++ /dev/null @@ -1,15 +0,0 @@ -{% from '@SyliusAdmin/Macro/translationForm.html.twig' import translationFormWithSlug %} - -
      - {{ form_errors(form) }} -
      - {{ form_row(form.code) }} - {{ form_row(form.parent) }} -
      -
      - {{ form_row(form.enabled) }} -
      -
      -{{ translationFormWithSlug(form.translations, '@SyliusAdmin/Taxon/_slugField.html.twig', taxon) }} - -{% include '@SyliusAdmin/Taxon/_media.html.twig' %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/_media.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/_media.html.twig deleted file mode 100644 index 68633b4e40..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/_media.html.twig +++ /dev/null @@ -1,7 +0,0 @@ -{% form_theme form '@SyliusUi/Form/imagesTheme.html.twig' %} - -
      -

      {{ 'sylius.ui.media'|trans }}

      -
      - {{ form_row(form.images, {'label': false}) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/_slugField.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/_slugField.html.twig deleted file mode 100644 index b541cea194..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/_slugField.html.twig +++ /dev/null @@ -1,14 +0,0 @@ -
      - {{ form_label(slugField) }} - {% if resource.slug == null %} - {{ form_widget(slugField, {'attr': {'data-url': path('sylius_admin_ajax_generate_taxon_slug'), 'data-parent': app.request.attributes.get('id')}}) }} - {% else %} -
      - {{ form_widget(slugField, {'attr': {'readonly': 'readonly', 'data-url': path('sylius_admin_ajax_generate_taxon_slug'), 'data-parent': resource.parent ? resource.parent.id : null}}) }} - - - -
      - {% endif %} - {{ form_errors(slugField) }} -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/_taxonTree.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/_taxonTree.html.twig deleted file mode 100644 index f1d26519c3..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/_taxonTree.html.twig +++ /dev/null @@ -1 +0,0 @@ -{{ render(path('sylius_admin_partial_taxon_tree', {'template': '@SyliusAdmin/Taxon/_treeWithButtons.html.twig'})) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/_treeWithButtons.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/_treeWithButtons.html.twig deleted file mode 100644 index fe5492abe3..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/_treeWithButtons.html.twig +++ /dev/null @@ -1,69 +0,0 @@ -{% import '@SyliusUi/Macro/buttons.html.twig' as buttons %} -{% import _self as tree %} - -{% macro render(taxons) %} - {% import '@SyliusUi/Macro/buttons.html.twig' as buttons %} - {% import _self as tree %} - - -{% endmacro %} - - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/_treeWithoutButtons.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/_treeWithoutButtons.html.twig deleted file mode 100644 index 0d24c70fbd..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/_treeWithoutButtons.html.twig +++ /dev/null @@ -1,42 +0,0 @@ -{% import _self as tree %} - -{% macro render(taxons) %} - {% import _self as tree %} - -
        - {% for taxon in taxons %} -
      • -
        -
        - -
        -
        - - {{ taxon.name }} - -
        -
        - {{ tree.render(taxon.children) }} -
        • - {% endfor %} -
      -{% endmacro %} - -
      - - - {{ 'sylius.ui.browse_all_products'|trans }} - - - - - {{ 'sylius.ui.manage_taxons'|trans }} - -
      - - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/create.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/create.html.twig deleted file mode 100644 index 95813c7b39..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/create.html.twig +++ /dev/null @@ -1,14 +0,0 @@ -{% extends '@SyliusAdmin/Crud/create.html.twig' %} - -{% block content %} - {{ sylius_template_event('sylius.admin.taxon.create.before_content', {'resource': resource}) }} - -
      -
      - {{ sylius_template_event('sylius.admin.taxon.create.taxon_tree', {'resource': resource}) }} -
      -
      - {{ parent() }} -
      -
      -{% endblock %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/update.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/update.html.twig deleted file mode 100644 index b41c9c751b..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/update.html.twig +++ /dev/null @@ -1,14 +0,0 @@ -{% extends '@SyliusAdmin/Crud/update.html.twig' %} - -{% block content %} - {{ sylius_template_event('sylius.admin.taxon.update.before_content', {'resource': resource}) }} - -
      -
      - {{ sylius_template_event('sylius.admin.taxon.update.taxon_tree', {'resource': resource}) }} -
      -
      - {{ parent() }} -
      -
      -{% endblock %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Zone/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Zone/_form.html.twig deleted file mode 100644 index fa0d02873f..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Zone/_form.html.twig +++ /dev/null @@ -1,22 +0,0 @@ -{{ form_errors(form) }} -
      -
      - {{ form_row(form.type) }} - {{ form_row(form.code) }} -
      -
      - {{ form_row(form.name) }} - {{ form_row(form.scope) }} -
      -
      -
      -

      {{ 'sylius.ui.members'|trans }}

      - {{ form_row(form.members, {'label': false}) }} -
      - - diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/_channelLinks.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/_channelLinks.html.twig deleted file mode 100644 index c60b9a21f4..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/_channelLinks.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% deprecated "This template has been moved to @SyliusAdmin/Layout/_channelLinks.html.twig" %} - -{% include "@SyliusAdmin/Layout/_channelLinks.html.twig" %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/_divider.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/_divider.html.twig deleted file mode 100644 index 54b2e75339..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/_divider.html.twig +++ /dev/null @@ -1 +0,0 @@ -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/_flashes.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/_flashes.html.twig deleted file mode 100644 index a6d6567e8f..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/_flashes.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% deprecated "This template has been moved to @SyliusAdmin/Layout/_flashes.html.twig" %} - -{% include "@SyliusAdmin/Layout/_flashes.html.twig" %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/_logo.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/_logo.html.twig deleted file mode 100644 index 49e1a0a7d1..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/_logo.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% deprecated "This template has been moved to @SyliusAdmin/Layout/_logo.html.twig" %} - -{% include "@SyliusAdmin/Layout/_logo.html.twig" %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/_menu.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/_menu.html.twig deleted file mode 100644 index a9d9647458..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/_menu.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% deprecated "This template has been moved to @SyliusAdmin/Layout/_menu.html.twig" %} - -{% include "@SyliusAdmin/Layout/_menu.html.twig" %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/_notification.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/_notification.html.twig deleted file mode 100644 index b3c246012e..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/_notification.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% deprecated "This template has been moved to @SyliusAdmin/Layout/_notification.html.twig" %} - -{% include "@SyliusAdmin/Layout/_notification.html.twig" %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/_scripts.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/_scripts.html.twig deleted file mode 100644 index 0e6482422f..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/_scripts.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% deprecated "This template has been moved to @SyliusAdmin/Layout/_scripts.html.twig" %} - -{% include "@SyliusAdmin/Layout/_scripts.html.twig" %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/_search.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/_search.html.twig deleted file mode 100644 index f7a47470ba..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/_search.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% deprecated "This template has been moved to @SyliusAdmin/Layout/_search.html.twig" %} - -{% include "@SyliusAdmin/Layout/_search.html.twig" %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/_security.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/_security.html.twig deleted file mode 100644 index ebda5cfc59..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/_security.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% deprecated "This template has been moved to @SyliusAdmin/Layout/_security.html.twig" %} - -{% include "@SyliusAdmin/Layout/_security.html.twig" %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/_styles.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/_styles.html.twig deleted file mode 100644 index d6356eea2a..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/_styles.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% deprecated "This template has been moved to @SyliusAdmin/Layout/_styles.html.twig" %} - -{% include "@SyliusAdmin/Layout/_styles.html.twig" %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/_support.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/_support.html.twig deleted file mode 100644 index 809beaf033..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/_support.html.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% deprecated "This template has been moved to @SyliusAdmin/Layout/_support.html.twig" %} - -{% include "@SyliusAdmin/Layout/_support.html.twig" %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/layout.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/layout.html.twig deleted file mode 100644 index 298ea6dbf5..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/layout.html.twig +++ /dev/null @@ -1,35 +0,0 @@ -{% extends '@SyliusAdmin/Layout/layout.html.twig' %} - -{% block title %} | Sylius{% endblock %} - -{% block stylesheets %} - {{ sylius_template_event('sylius.admin.layout.stylesheets') }} -{% endblock %} - -{% block flash_messages %} - {% include '@SyliusAdmin/_flashes.html.twig' %} -{% endblock %} - -{% block topbar %} - {{ sylius_template_event('sylius.admin.layout.topbar_left') }} - -
      - - {{ sylius_template_event('sylius.admin.layout.topbar_middle') }} - -
      - - {{ sylius_template_event('sylius.admin.layout.topbar_right') }} -{% endblock %} - -{% block sidebar %} - {{ sylius_template_event('sylius.admin.layout.sidebar') }} -{% endblock %} - -{% block footer %} -{{ 'sylius.ui.powered_by'|trans }} Sylius v{{ sylius_meta.version }}. {{ 'sylius.ui.see_issue'|trans }}? {{ 'sylius.ui.report_it'|trans }}! -{% endblock %} - -{% block javascripts %} - {{ sylius_template_event('sylius.admin.layout.javascripts') }} -{% endblock %} From 8f09df2fc09da994574bc2c1896446e39008fec5 Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Mon, 9 Oct 2023 13:07:30 +0200 Subject: [PATCH 038/166] Add missing fields for the product's index page --- .../Resources/assets/styles/_avatar.scss | 5 +++++ .../Resources/config/grids/product.yml | 4 ++-- .../Resources/config/routing/product.yml | 16 +--------------- .../Resources/translations/messages.en.yml | 1 + .../views/Product/Grid/Field/mainTaxon.html.twig | 9 +++++++++ .../views/Product/Grid/Field/name.html.twig | 9 +++++++++ .../Product/Grid/Field/productImage.html.twig | 11 +++++++++++ 7 files changed, 38 insertions(+), 17 deletions(-) create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Grid/Field/mainTaxon.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Grid/Field/name.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Grid/Field/productImage.html.twig diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_avatar.scss b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_avatar.scss index 228cfa1644..b0abd8d380 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_avatar.scss +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_avatar.scss @@ -11,6 +11,11 @@ &.avatar { background-color: $gray-100; } + + &.avatar-l { + --tblr-avatar-size: 3rem; + } + &.alert { background-color: #fff; } diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/product.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/product.yml index c36852c7e2..dc26c8b664 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/product.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/product.yml @@ -16,7 +16,7 @@ sylius_grid: label: sylius.ui.image path: . options: - template: "@SyliusAdmin/Product/Grid/Field/image.html.twig" + template: "@SyliusAdmin/Product/Grid/Field/productImage.html.twig" code: type: string label: sylius.ui.code @@ -36,7 +36,7 @@ sylius_grid: type: twig label: sylius.ui.enabled options: - template: "@SyliusUi/Grid/Field/enabled.html.twig" + template: "@SyliusAdmin/Shared/Grid/Field/boolean.html.twig" filters: search: type: string diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product.yml index 59161179e7..91d25424dc 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product.yml @@ -3,7 +3,7 @@ sylius_admin_product: alias: sylius.product section: admin templates: "@SyliusAdmin\\Shared\\Crud" - except: ['index', 'update'] + except: ['update'] redirect: update grid: sylius_admin_product permission: true @@ -16,20 +16,6 @@ sylius_admin_product: icon: cube type: sylius.resource -sylius_admin_product_index: - path: /products/ - methods: [GET] - defaults: - _controller: sylius.controller.product::indexAction - _sylius: - section: admin - permission: true - grid: sylius_admin_product - template: "@SyliusAdmin/Product/index.html.twig" - vars: - subheader: sylius.ui.manage_your_product_catalog - icon: cube - sylius_admin_product_update: path: /products/{id}/edit methods: [GET, PUT, PATCH] diff --git a/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.en.yml b/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.en.yml index 3caa9f47fa..52cdab1cc4 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.en.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.en.yml @@ -70,6 +70,7 @@ sylius: PayPal Commerce Platform integration. lowest_price_before_discount: 'Lowest price before discount' minimum_price_details: Minimum price - this is the pricing threshold below which the current price cannot be discounted by neither catalog nor cart promotions. Use this to guard the profitability of your sales. + no_main_taxon: 'no main taxon' no_results: No results found no_results_adjust_your_search: 'Adjust your search and try again.' original_price_details: Original price - this is the price of the product variant It is displayed as crossed-out in the catalog. It is used as the base for current price calculations. If this value is not defined, Catalog Promotion logic will copy value from Price to Original Price. diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Grid/Field/mainTaxon.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Grid/Field/mainTaxon.html.twig new file mode 100644 index 0000000000..e06c270f0e --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Grid/Field/mainTaxon.html.twig @@ -0,0 +1,9 @@ +{% if data.name is defined %} + {{ data.name }} +{% else %} + {% from '@SyliusAdmin/Shared/Helper/icon.html.twig' import icon as _icon %} + + + {{ _icon({ icon: 'exclamation-circle' }) }} {{ 'sylius.ui.no_main_taxon'|trans }} + +{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Grid/Field/name.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Grid/Field/name.html.twig new file mode 100644 index 0000000000..71557d7b40 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Grid/Field/name.html.twig @@ -0,0 +1,9 @@ +{% if data is not null %} + {{ data }} +{% else %} + {% from '@SyliusAdmin/Shared/Helper/icon.html.twig' import icon as _icon %} + + + {{ _icon({ icon: 'exclamation-circle' }) }} {{ 'sylius.ui.missing_translation'|trans }} + +{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Grid/Field/productImage.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Grid/Field/productImage.html.twig new file mode 100644 index 0000000000..b145bf563f --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Grid/Field/productImage.html.twig @@ -0,0 +1,11 @@ +{% set product = data %} + +{% if product.imagesByType('thumbnail') is not empty %} + {% set path = product.imagesByType('thumbnail').first.path|imagine_filter(filter|default('sylius_shop_product_thumbnail')) %} +{% elseif product.images.first %} + {% set path = product.images.first.path|imagine_filter(filter|default('sylius_shop_product_thumbnail')) %} +{% else %} + {% set path = asset('build/shop/images/200x200.png', 'shop') %} +{% endif %} + +{{ product.name }} From c720b1c17e1308ceb673399e8bad8a6baead8ba8 Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Tue, 17 Oct 2023 11:32:18 +0200 Subject: [PATCH 039/166] Add the product's CRUD --- .../Resources/assets/entrypoint.js | 1 + .../Resources/assets/scripts/choices.js | 76 ++++++- .../Resources/assets/scripts/sticky-header.js | 12 + .../Resources/assets/styles/_collapse.scss | 29 +++ .../Resources/assets/styles/_flags.scss | 10 + .../Resources/assets/styles/_form.scss | 13 ++ .../Resources/assets/styles/_layout.scss | 29 +++ .../Resources/assets/styles/main.scss | 3 + .../config/app/template_events/product.yaml | 172 ++++++++++++++ .../config/routing/ajax/product_option.yml | 1 + .../Resources/config/routing/ajax/taxon.yml | 1 + .../Resources/config/routing/product.yml | 50 +---- .../Resources/translations/messages.en.yml | 8 + .../TitleBlock/Actions/_cancel.html.twig | 8 + .../TitleBlock/Actions/_create.html.twig | 3 + .../Header/TitleBlock/_actions.html.twig | 10 + .../Form/Sections/_associations.html.twig | 9 + .../Form/Sections/_attributes.html.twig | 81 +++++++ .../Form/Sections/_channelPricing.html.twig | 75 +++++++ .../Product/Form/Sections/_details.html.twig | 35 +++ .../Form/Sections/_inventory.html.twig | 17 ++ .../Product/Form/Sections/_media.html.twig | 26 +++ .../Product/Form/Sections/_taxonomy.html.twig | 11 + .../Form/Sections/_translations.html.twig | 23 ++ .../SideNavigation/_associations.html.twig | 3 + .../Form/SideNavigation/_attributes.html.twig | 3 + .../SideNavigation/_channelPricing.html.twig | 7 + .../Form/SideNavigation/_details.html.twig | 3 + .../Form/SideNavigation/_inventory.html.twig | 7 + .../Form/SideNavigation/_media.html.twig | 3 + .../Form/SideNavigation/_taxonomy.html.twig | 3 + .../SideNavigation/_translations.html.twig | 3 + .../views/Product/Form/_sections.html.twig | 12 + .../Product/Form/_sideNavigation.html.twig | 10 + .../views/Product/Form/formBody.html.twig | 13 ++ .../Header/TitleBlock/_title.html.twig | 7 + .../PageBody/Taxonomy/_mainTaxon.html.twig | 10 + .../Taxonomy/_productTaxons.html.twig | 8 + .../TranslationContent/_description.html.twig | 4 + .../_metaDescription.html.twig | 4 + .../_metaKeywords.html.twig | 4 + .../TranslationContent/_name.html.twig | 4 + .../_shortDescription.html.twig | 4 + .../TranslationContent/_slug.html.twig | 4 + .../Content/PageBody/_associations.html.twig | 23 ++ .../Show/Content/PageBody/_details.html.twig | 209 ++++++++++++++++++ .../Show/Content/PageBody/_taxonomy.html.twig | 16 ++ .../Content/PageBody/_translations.html.twig | 36 +++ .../Product/Show/Content/_pageBody.html.twig | 11 + .../Actions/More/_viewInStore.html.twig | 8 + .../TitleBlock/Actions/_cancel.html.twig | 8 + .../Header/TitleBlock/Actions/_more.html.twig | 11 + .../TitleBlock/Actions/_update.html.twig | 3 + .../Header/TitleBlock/_actions.html.twig | 10 + .../Security/Login/Content/_form.html.twig | 2 +- .../Crud/Common/Content/_header.html.twig | 2 +- .../Crud/Create/Content/_form.html.twig | 2 +- .../Crud/Update/Content/_form.html.twig | 6 +- .../views/Shared/Crud/create.html.twig | 2 +- .../Shared/Grid/Filter/_boolean.html.twig | 2 +- .../views/Shared/Grid/Filter/_date.html.twig | 2 +- .../Shared/Grid/Filter/_entities.html.twig | 2 +- .../Shared/Grid/Filter/_entity.html.twig | 2 +- .../Shared/Grid/Filter/_exists.html.twig | 2 +- .../views/Shared/Grid/Filter/_money.html.twig | 2 +- .../Filter/_resourceAutocomplete.html.twig | 2 +- .../Shared/Grid/Filter/_select.html.twig | 2 +- .../Shared/Grid/Filter/_string.html.twig | 2 +- .../views/Shared/form_theme.html.twig | 21 ++ .../Doctrine/ORM/ProductOptionRepository.php | 8 +- .../Doctrine/ORM/TaxonRepository.php | 9 +- .../ProductOptionRepositoryInterface.php | 4 +- .../Repository/TaxonRepositoryInterface.php | 4 +- 73 files changed, 1162 insertions(+), 70 deletions(-) create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/assets/scripts/sticky-header.js create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_collapse.scss create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_form.scss create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_layout.scss create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/product.yaml create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Create/Header/TitleBlock/Actions/_cancel.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Create/Header/TitleBlock/Actions/_create.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Create/Header/TitleBlock/_actions.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_associations.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_attributes.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_channelPricing.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_details.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_inventory.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_media.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_taxonomy.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_translations.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/SideNavigation/_associations.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/SideNavigation/_attributes.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/SideNavigation/_channelPricing.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/SideNavigation/_details.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/SideNavigation/_inventory.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/SideNavigation/_media.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/SideNavigation/_taxonomy.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/SideNavigation/_translations.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/_sections.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/_sideNavigation.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/formBody.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/Header/TitleBlock/_title.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/Taxonomy/_mainTaxon.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/Taxonomy/_productTaxons.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/TranslationContent/_description.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/TranslationContent/_metaDescription.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/TranslationContent/_metaKeywords.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/TranslationContent/_name.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/TranslationContent/_shortDescription.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/TranslationContent/_slug.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/_associations.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/_details.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/_taxonomy.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/_translations.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/_pageBody.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Update/Header/TitleBlock/Actions/More/_viewInStore.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Update/Header/TitleBlock/Actions/_cancel.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Update/Header/TitleBlock/Actions/_more.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Update/Header/TitleBlock/Actions/_update.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Update/Header/TitleBlock/_actions.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/form_theme.html.twig diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/entrypoint.js b/src/Sylius/Bundle/AdminBundle/Resources/assets/entrypoint.js index 8203216c06..ada57a3e3d 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/assets/entrypoint.js +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/entrypoint.js @@ -11,6 +11,7 @@ import './styles/main.scss'; import './scripts/choices'; import './scripts/statistics_chart'; +import './scripts/sticky-header'; import 'bootstrap'; diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/scripts/choices.js b/src/Sylius/Bundle/AdminBundle/Resources/assets/scripts/choices.js index a44587167b..d787aefe49 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/assets/scripts/choices.js +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/scripts/choices.js @@ -10,13 +10,87 @@ import Choices from 'choices.js'; (function () { + const initValues = (initUrl, currentValues, choiceLabelField, choiceValueField, callback) => { + const defaultChoicesParam = currentValues.split(',').map((item) => `${choiceValueField}[]=${item}`).join('&'); + fetch(`${initUrl}?${defaultChoicesParam}`, { + method: 'GET', + headers: { + 'Content-Type': 'application/json', + }, + }) + .then((response) => response.json()) + .then((data) => { + callback(data.map((item) => ({ label: item[choiceLabelField], value: item[choiceValueField], selected: true }))); + }) + .catch((error) => console.error('Error:', error)); + }; + // eslint-disable-next-line no-undef const items = document.querySelectorAll('[data-choices]'); if (items.length) { items.forEach((el) => { + const { + inputId, + initUrl, + searchUrl, + noChoicesText, + choiceLabelField, + choiceValueField, + } = el.dataset; + const isMultiple = el.getAttribute('multiple') != null; + // eslint-disable-next-line no-undef + const input = document.getElementById(inputId); + // eslint-disable-next-line no-new - new Choices(el); + const choices = new Choices(el, { + noChoicesText, + }); + + if (initUrl != null || input.value != null) { + initValues(initUrl, input.value, choiceLabelField, choiceValueField, (data) => choices.setChoices(data)); + } + + el.addEventListener('search', (event) => { + let excludes; + if (isMultiple) { + const currentChoices = choices.getValue() == null ? [] : choices.getValue(); + excludes = currentChoices.map((item) => `excludes[]=${item.value}`).join('&'); + } else { + excludes = `excludes[]=${choices.getValue(true) == null ? '' : choices.getValue(true)}`; + } + fetch(`${searchUrl}?phrase=${event.detail.value}&${excludes}`, { + method: 'GET', + headers: { + 'Content-Type': 'application/json', + }, + }) + .then((response) => response.json()) + .then((data) => { + choices.setChoices(data.map((item) => ({ label: item[choiceLabelField], value: item[choiceValueField] })), 'value', 'label', true); + }) + .catch((error) => console.error('Error:', error)); + }); + + el.addEventListener('addItem', () => { + if (!isMultiple) { + input.value = choices.getValue(true) == null ? '' : choices.getValue(true); + } else { + input.value = choices.getValue().map((item) => item.value).join(','); + } + + choices.setChoices([], 'value', 'label', true); + }); + + el.addEventListener('removeItem', () => { + if (!isMultiple) { + input.value = choices.getValue(true) == null ? '' : choices.getValue(true); + } else { + input.value = choices.getValue().map((item) => item.value).join(','); + } + + choices.setChoices([], 'value', 'label', true); + }); }); } }()); diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/scripts/sticky-header.js b/src/Sylius/Bundle/AdminBundle/Resources/assets/scripts/sticky-header.js new file mode 100644 index 0000000000..2b89ea8c4e --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/scripts/sticky-header.js @@ -0,0 +1,12 @@ +(function() { + const el = document.querySelector('[data-sticky-header]'); + + const observer = new IntersectionObserver( + ([e]) => e.target.classList.toggle('is-sticky', e.intersectionRatio < 1), + { threshold: [1] } + ); + + if (el) { + observer.observe(el) + } +})(); diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_collapse.scss b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_collapse.scss new file mode 100644 index 0000000000..5da6e00303 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_collapse.scss @@ -0,0 +1,29 @@ +/*! + * This file is part of the Sylius package. + * + * (c) Sylius Sp. z o.o. + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + + +.btn-collapse { + &.collapsed { + .icon-chevron-right { + display: inline-flex; + } + .icon-chevron-down { + display: none; + } + } + + &:not(.collapsed) { + .icon-chevron-right { + display: none; + } + .icon-chevron-down { + display: inline-flex; + } + } +} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_flags.scss b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_flags.scss index 783a3753de..ef9c3186c8 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_flags.scss +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_flags.scss @@ -9,3 +9,13 @@ @import "@tabler/core/src/scss/config"; @import "ui/flags"; + +.flag-sm { + height: 1rem; + vertical-align: -3px; + background-repeat: no-repeat; + background-position: center; + background-size: cover; + border: var(--tblr-border-width) var(--tblr-border-style) var(--tblr-border-color); + border-radius: var(--tblr-border-radius); +} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_form.scss b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_form.scss new file mode 100644 index 0000000000..1bb1afe404 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_form.scss @@ -0,0 +1,13 @@ +/*! + * This file is part of the Sylius package. + * + * (c) Sylius Sp. z o.o. + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +textarea.form-control { + min-height: 8rem; + height: 12rem; +} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_layout.scss b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_layout.scss new file mode 100644 index 0000000000..cbfddcf401 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_layout.scss @@ -0,0 +1,29 @@ +/*! + * This file is part of the Sylius package. + * + * (c) Sylius Sp. z o.o. + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +.page-wrapper { + .page-header { + position: sticky; + top: -1px; + z-index: 999999; + margin-top: 0; + padding-top: var(--tblr-page-padding-y); + padding-bottom: var(--tblr-page-padding-y); + + &.is-sticky { + background: #fff; + border-bottom: var(--tblr-border-width) solid var(--tblr-border-color); + box-shadow: var(--tblr-shadow-card); + } + } + + .page-body { + margin-top: 0; + } +} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/main.scss b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/main.scss index eeaff9c5ea..67c6689596 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/main.scss +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/main.scss @@ -25,4 +25,7 @@ body { @import "alert"; @import "avatar"; +@import "collapse"; +@import "form"; +@import "layout"; @import "navbar"; diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/product.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/product.yaml new file mode 100644 index 0000000000..2638b0c3dd --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/product.yaml @@ -0,0 +1,172 @@ +sylius_ui: + events: + # Show + sylius.admin.product.show.content: + blocks: + page_body: + template: '@SyliusAdmin/Product/Show/Content/_pageBody.html.twig' + sylius.admin.product.show.content.header.title_block: + blocks: + title: + template: '@SyliusAdmin/Product/Show/Content/Header/TitleBlock/_title.html.twig' + sylius.admin.product.show.content.page_body: + blocks: + details: + template: '@SyliusAdmin/Product/Show/Content/PageBody/_details.html.twig' + translations: + template: '@SyliusAdmin/Product/Show/Content/PageBody/_translations.html.twig' + taxonomy: + template: '@SyliusAdmin/Product/Show/Content/PageBody/_taxonomy.html.twig' + associations: + template: '@SyliusAdmin/Product/Show/Content/PageBody/_associations.html.twig' + sylius.admin.product.show.content.page_body.taxonomy: + blocks: + main_taxon: + template: '@SyliusAdmin/Product/Show/Content/PageBody/Taxonomy/_mainTaxon.html.twig' + product_taxons: + template: '@SyliusAdmin/Product/Show/Content/PageBody/Taxonomy/_productTaxons.html.twig' + sylius.admin.product.show.content.page_body.translations.translation_content: + blocks: + name: + template: '@SyliusAdmin/Product/Show/Content/PageBody/TranslationContent/_name.html.twig' + slug: + template: '@SyliusAdmin/Product/Show/Content/PageBody/TranslationContent/_slug.html.twig' + description: + template: '@SyliusAdmin/Product/Show/Content/PageBody/TranslationContent/_description.html.twig' + short_description: + template: '@SyliusAdmin/Product/Show/Content/PageBody/TranslationContent/_shortDescription.html.twig' + meta_keywords: + template: '@SyliusAdmin/Product/Show/Content/PageBody/TranslationContent/_metaKeywords.html.twig' + meta_description: + template: '@SyliusAdmin/Product/Show/Content/PageBody/TranslationContent/_metaDescription.html.twig' + + # Update + sylius.admin.product.update.content: + blocks: + form: + context: + render_rest: false + sylius.admin.product.update.content.header.title_block: + blocks: + actions: + template: '@SyliusAdmin/Product/Update/Header/TitleBlock/_actions.html.twig' + sylius.admin.product.update.content.header.title_block.actions: + blocks: + more: + template: '@SyliusAdmin/Product/Update/Header/TitleBlock/Actions/_more.html.twig' + cancel: + template: '@SyliusAdmin/Product/Update/Header/TitleBlock/Actions/_cancel.html.twig' + create: + template: '@SyliusAdmin/Product/Update/Header/TitleBlock/Actions/_update.html.twig' + sylius.admin.product.update.content.header.title_block.actions.more: + blocks: + view_in_store: + template: '@SyliusAdmin/Product/Update/Header/TitleBlock/Actions/More/_viewInStore.html.twig' + sylius.admin.product.update.content.form: + blocks: + form_body: + template: '@SyliusAdmin/Product/Form/formBody.html.twig' + sylius.admin.product.update.content.form.form_body: + blocks: + side_navigation: + template: '@SyliusAdmin/Product/Form/_sideNavigation.html.twig' + sections: + template: '@SyliusAdmin/Product/Form/_sections.html.twig' + sylius.admin.product.update.content.form.form_body.side_navigation: + blocks: + details: + template: '@SyliusAdmin/Product/Form/SideNavigation/_details.html.twig' + context: + active: true + channel_pricing: + template: '@SyliusAdmin/Product/Form/SideNavigation/_channelPricing.html.twig' + inventory: + template: '@SyliusAdmin/Product/Form/SideNavigation/_inventory.html.twig' + translations: + template: '@SyliusAdmin/Product/Form/SideNavigation/_translations.html.twig' + taxonomy: + template: '@SyliusAdmin/Product/Form/SideNavigation/_taxonomy.html.twig' + attributes: + template: '@SyliusAdmin/Product/Form/SideNavigation/_attributes.html.twig' + associations: + template: '@SyliusAdmin/Product/Form/SideNavigation/_associations.html.twig' + media: + template: '@SyliusAdmin/Product/Form/SideNavigation/_media.html.twig' + sylius.admin.product.update.content.form.form_body.sections: + blocks: + details: + template: '@SyliusAdmin/Product/Form/Sections/_details.html.twig' + translations: + template: '@SyliusAdmin/Product/Form/Sections/_translations.html.twig' + taxonomy: + template: '@SyliusAdmin/Product/Form/Sections/_taxonomy.html.twig' + attributes: + template: '@SyliusAdmin/Product/Form/Sections/_attributes.html.twig' + associations: + template: '@SyliusAdmin/Product/Form/Sections/_associations.html.twig' + media: + template: '@SyliusAdmin/Product/Form/Sections/_media.html.twig' + # Create + sylius.admin.product.create.content: + blocks: + form: + context: + render_rest: false + sylius.admin.product.create.content.header.title_block: + blocks: + actions: + template: '@SyliusAdmin/Product/Create/Header/TitleBlock/_actions.html.twig' + sylius.admin.product.create.content.header.title_block.actions: + blocks: + cancel: + template: '@SyliusAdmin/Product/Create/Header/TitleBlock/Actions/_cancel.html.twig' + create: + template: '@SyliusAdmin/Product/Create/Header/TitleBlock/Actions/_create.html.twig' + sylius.admin.product.create.content.form: + blocks: + form_body: + template: '@SyliusAdmin/Product/Form/formBody.html.twig' + sylius.admin.product.create.content.form.form_body: + blocks: + side_navigation: + template: '@SyliusAdmin/Product/Form/_sideNavigation.html.twig' + sections: + template: '@SyliusAdmin/Product/Form/_sections.html.twig' + sylius.admin.product.create.content.form.form_body.side_navigation: + blocks: + details: + template: '@SyliusAdmin/Product/Form/SideNavigation/_details.html.twig' + context: + active: true + channel_pricing: + template: '@SyliusAdmin/Product/Form/SideNavigation/_channelPricing.html.twig' + inventory: + template: '@SyliusAdmin/Product/Form/SideNavigation/_inventory.html.twig' + translations: + template: '@SyliusAdmin/Product/Form/SideNavigation/_translations.html.twig' + taxonomy: + template: '@SyliusAdmin/Product/Form/SideNavigation/_taxonomy.html.twig' + attributes: + template: '@SyliusAdmin/Product/Form/SideNavigation/_attributes.html.twig' + associations: + template: '@SyliusAdmin/Product/Form/SideNavigation/_associations.html.twig' + media: + template: '@SyliusAdmin/Product/Form/SideNavigation/_media.html.twig' + sylius.admin.product.create.content.form.form_body.sections: + blocks: + details: + template: '@SyliusAdmin/Product/Form/Sections/_details.html.twig' + channel_pricing: + template: '@SyliusAdmin/Product/Form/Sections/_channelPricing.html.twig' + inventory: + template: '@SyliusAdmin/Product/Form/Sections/_inventory.html.twig' + translations: + template: '@SyliusAdmin/Product/Form/Sections/_translations.html.twig' + taxonomy: + template: '@SyliusAdmin/Product/Form/Sections/_taxonomy.html.twig' + attributes: + template: '@SyliusAdmin/Product/Form/Sections/_attributes.html.twig' + associations: + template: '@SyliusAdmin/Product/Form/Sections/_associations.html.twig' + media: + template: '@SyliusAdmin/Product/Form/Sections/_media.html.twig' diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/ajax/product_option.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/ajax/product_option.yml index 934d7fd2f5..c89d27c040 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/ajax/product_option.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/ajax/product_option.yml @@ -13,6 +13,7 @@ sylius_admin_ajax_product_options_by_phrase: phrase: $phrase locale: expr:service('sylius.context.locale').getLocaleCode() limit: "!!int %sylius.ajax.product.option_autocomplete_limit%" + excludes: $excludes sylius_admin_ajax_find_product_options: path: /options diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/ajax/taxon.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/ajax/taxon.yml index 7639ef523c..7b0f82098c 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/ajax/taxon.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/ajax/taxon.yml @@ -52,6 +52,7 @@ sylius_admin_ajax_taxon_by_name_phrase: phrase: expr:service('request_stack').getCurrentRequest().query.get('phrase', '') locale: null limit: 25 + excludes: $excludes sylius_admin_ajax_generate_taxon_slug: path: /generate-slug/ diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product.yml index 91d25424dc..a1f7ef1eff 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product.yml @@ -3,7 +3,6 @@ sylius_admin_product: alias: sylius.product section: admin templates: "@SyliusAdmin\\Shared\\Crud" - except: ['update'] redirect: update grid: sylius_admin_product permission: true @@ -16,23 +15,6 @@ sylius_admin_product: icon: cube type: sylius.resource -sylius_admin_product_update: - path: /products/{id}/edit - methods: [GET, PUT, PATCH] - defaults: - _controller: sylius.controller.product::updateAction - _sylius: - section: admin - permission: true - redirect: referer - template: "@SyliusAdmin/Crud/update.html.twig" - vars: - subheader: sylius.ui.manage_your_product_catalog - icon: cube - templates: - form: "@SyliusAdmin/Product/_form.html.twig" - toolbar: "@SyliusAdmin/Product/Update/_toolbar.html.twig" - sylius_admin_product_per_taxon_index: path: /products/taxon/{taxonId} methods: [GET] @@ -47,23 +29,6 @@ sylius_admin_product_per_taxon_index: subheader: sylius.ui.manage_your_product_catalog icon: cube -sylius_admin_product_create: - path: /products/new - methods: [GET, POST] - defaults: - _controller: sylius.controller.product::createAction - _sylius: - section: admin - permission: true - template: "@SyliusAdmin/Crud/create.html.twig" - redirect: sylius_admin_product_update - vars: - subheader: sylius.ui.manage_your_product_catalog - templates: - form: "@SyliusAdmin/Product/_form.html.twig" - route: - name: sylius_admin_product_create - sylius_admin_product_create_simple: path: /products/new/simple methods: [GET, POST] @@ -74,25 +39,12 @@ sylius_admin_product_create_simple: permission: true factory: method: createWithVariant - template: "@SyliusAdmin/Crud/create.html.twig" + template: "@SyliusAdmin/Shared/Crud/create.html.twig" redirect: sylius_admin_product_update vars: - subheader: sylius.ui.manage_your_product_catalog - templates: - form: "@SyliusAdmin/Product/_form.html.twig" route: name: sylius_admin_product_create_simple -sylius_admin_product_show: - path: /products/{id} - methods: [GET] - defaults: - _controller: sylius.controller.product::showAction - _sylius: - section: admin - permission: true - template: "@SyliusAdmin/Product/show.html.twig" - sylius_admin_channel_pricing_log_entry_index: path: products/{productId}/variants/{variantId}/channel-pricing/{channelPricingId}/channel-pricing-log-entries methods: [GET] diff --git a/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.en.yml b/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.en.yml index 52cdab1cc4..4338e26c90 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.en.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.en.yml @@ -70,9 +70,14 @@ sylius: PayPal Commerce Platform integration. lowest_price_before_discount: 'Lowest price before discount' minimum_price_details: Minimum price - this is the pricing threshold below which the current price cannot be discounted by neither catalog nor cart promotions. Use this to guard the profitability of your sales. + more: 'More' no_main_taxon: 'no main taxon' + no_depth: 'No depth' + no_height: 'No height' no_results: No results found no_results_adjust_your_search: 'Adjust your search and try again.' + no_weight: 'No weight' + no_width: 'No width' original_price_details: Original price - this is the price of the product variant It is displayed as crossed-out in the catalog. It is used as the base for current price calculations. If this value is not defined, Catalog Promotion logic will copy value from Price to Original Price. pagination: number_of_results: 'Showing %from% to %to% of %total% entries' @@ -83,6 +88,7 @@ sylius: sales_summary: Sales summary shipment_for_order: Shipment for order show_history_for_channel_pricing: 'Show history for channel pricing' + start_typing_to_search: 'Start typing to search' statistics: day: Day lifetime: Lifetime @@ -90,3 +96,5 @@ sylius: week: Week 2weeks: 2 Weeks year: Year + view_in_store: 'View in store' + work_in_progress: Work in progress diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Create/Header/TitleBlock/Actions/_cancel.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Create/Header/TitleBlock/Actions/_cancel.html.twig new file mode 100644 index 0000000000..7317bdc21d --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Create/Header/TitleBlock/Actions/_cancel.html.twig @@ -0,0 +1,8 @@ +{% import '@SyliusAdmin/Shared/Helper/button.html.twig' as _button %} + +{% set index_url = path( + configuration.vars.index.route.name|default(configuration.getRouteName('index')), + configuration.vars.index.route.parameters|default(configuration.vars.route.parameters|default({})) +) %} + +{{ _button.cancel({ text: 'sylius.ui.cancel'|trans, url: index_url, class: 'btn' }) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Create/Header/TitleBlock/Actions/_create.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Create/Header/TitleBlock/Actions/_create.html.twig new file mode 100644 index 0000000000..aeb0010882 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Create/Header/TitleBlock/Actions/_create.html.twig @@ -0,0 +1,3 @@ +{% import '@SyliusAdmin/Shared/Helper/button.html.twig' as _button %} + +{{ _button.primary({ text: 'sylius.ui.create'|trans, type: 'submit', form: form.vars.id }) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Create/Header/TitleBlock/_actions.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Create/Header/TitleBlock/_actions.html.twig new file mode 100644 index 0000000000..62f6aedb73 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Create/Header/TitleBlock/_actions.html.twig @@ -0,0 +1,10 @@ +{% import '@SyliusAdmin/Shared/Helper/button.html.twig' as _button %} + +{% set main_event = twig_event_name(_context.main_event, 'actions') %} +{% set fallback_event = twig_event_name(_context.fallback_event, 'actions') %} + +
      +
      + {{ twig_event([main_event, fallback_event], _context|merge({ main_event: main_event, fallback_event: fallback_event })) }} +
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_associations.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_associations.html.twig new file mode 100644 index 0000000000..b29ff592d3 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_associations.html.twig @@ -0,0 +1,9 @@ +
      +
      +
      +

      + {{ 'sylius.ui.associations'|trans }} {{ 'sylius.ui.work_in_progress'|trans }} +

      +
      +
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_attributes.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_attributes.html.twig new file mode 100644 index 0000000000..1b5be749ff --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_attributes.html.twig @@ -0,0 +1,81 @@ +
      +
      +
      +

      + {{ 'sylius.ui.attributes'|trans }} {{ 'sylius.ui.work_in_progress'|trans }} +

      +
      +
      +
      +
      +
      +
      +
      + +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      + + apply to all +
      + +
      +
      +
      +
      +
      +
      + + apply to all +
      + +
      +
      +
      +
      +
      +
      + + apply to all +
      + +
      +
      +
      +
      +
      +
      + + apply to all +
      + +
      +
      +
      +
      +
      +
      +
      +
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_channelPricing.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_channelPricing.html.twig new file mode 100644 index 0000000000..321a7f8112 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_channelPricing.html.twig @@ -0,0 +1,75 @@ +{% set product = _context.form.vars.data %} + +{% if product.isSimple %} +
      + {% set variantForm = _context.form.variant %} + + {% set isChannelPricingInvalid = variantForm.channelPricings.vars.errors is not empty %} + + {% if isChannelPricingInvalid %} + {% from '@SyliusAdmin/Shared/Helper/icon.html.twig' import icon as _icon %} + + + {% endif %} + +
      + {% if isChannelPricingInvalid %} +
      + {% endif %} +
      + +
      +
      +
      + {% for channelCode, channelPricing in variantForm.channelPricings %} + {% if loop.index0 == 0 %} +
      + {% if channelCode not in product.channels|map(channel => channel.code) %} +
      + {{ 'sylius.ui.product.product_not_active_in_channel'|trans }} +
      + {% endif %} + {{ form_row(channelPricing, {'label': false}) }} +
      + {% else %} +
      + {% if channelCode not in product.channels|map(channel => channel.code) %} +
      + {{ 'sylius.ui.product.product_not_active_in_channel'|trans }} +
      + {% endif %} + {{ form_row(channelPricing, {'label': false}) }} +
      + {% endif %} + {% endfor %} +
      +
      +
      +
      +{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_details.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_details.html.twig new file mode 100644 index 0000000000..e04b631d0c --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_details.html.twig @@ -0,0 +1,35 @@ +{% set product = form.vars.data %} + +
      +
      +
      +

      + {{ 'sylius.ui.details'|trans }} +

      +
      +
      +
      + {{ form_row(form.code) }} +
      +
      + {{ form_row(form.enabled) }} +
      +
      + {{ form_row(form.channels) }} +
      + {% if product.isSimple == false %} +
      + {{ form_row(form.options, {'search_url': path('sylius_admin_ajax_product_options_by_phrase'), 'init_load_url': path('sylius_admin_ajax_find_product_options')}) }} +
      + {% endif %} +
      + {{ form_row(form.variantSelectionMethod) }} +
      + {% if product.isSimple %} +
      + {{ form_row(form.variant.translations) }} +
      + {% endif %} +
      +
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_inventory.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_inventory.html.twig new file mode 100644 index 0000000000..fc63ad3c5a --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_inventory.html.twig @@ -0,0 +1,17 @@ +{% set product = _context.form.vars.data %} + +{% if product.isSimple %} + {% set variantForm = _context.form.variant %} +
      +
      +
      +

      {{ 'sylius.ui.inventory'|trans }}

      +
      +
      + {{ form_row(variantForm.onHand) }} + {{ form_row(variantForm.tracked) }} + {{ form_row(variantForm.version) }} +
      +
      +
      +{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_media.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_media.html.twig new file mode 100644 index 0000000000..8ff7d69cd0 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_media.html.twig @@ -0,0 +1,26 @@ +
      +
      +
      +

      + {{ 'sylius.ui.media'|trans }} {{ 'sylius.ui.work_in_progress'|trans }} +

      +
      +
      + {% for imageForm in form.images %} +
      +
      + +
      +
      +
      + {{ form_row(imageForm.type) }} +
      +
      + {{ form_row(imageForm.file) }} +
      +
      +
      + {% endfor %} +
      +
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_taxonomy.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_taxonomy.html.twig new file mode 100644 index 0000000000..1ef251b8cc --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_taxonomy.html.twig @@ -0,0 +1,11 @@ +
      +
      +
      +

      {{ 'sylius.ui.taxonomy'|trans }}

      +
      +
      + {{ form_row(form.mainTaxon, { 'search_url': path('sylius_admin_ajax_taxon_by_name_phrase'), 'init_load_url': path('sylius_admin_ajax_taxon_by_code') }) }} +
      +
      + +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_translations.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_translations.html.twig new file mode 100644 index 0000000000..a2c6646828 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_translations.html.twig @@ -0,0 +1,23 @@ +
      +
      +
      + {% for locale, translationForm in form.translations %} +
      +

      + +

      +
      +
      + {% for field in translationForm %} + {{ form_row(field) }} + {% endfor %} +
      +
      +
      + {% endfor %} +
      +
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/SideNavigation/_associations.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/SideNavigation/_associations.html.twig new file mode 100644 index 0000000000..d18b31eabe --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/SideNavigation/_associations.html.twig @@ -0,0 +1,3 @@ + diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/SideNavigation/_attributes.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/SideNavigation/_attributes.html.twig new file mode 100644 index 0000000000..7f74ee38f0 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/SideNavigation/_attributes.html.twig @@ -0,0 +1,3 @@ + diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/SideNavigation/_channelPricing.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/SideNavigation/_channelPricing.html.twig new file mode 100644 index 0000000000..292fe19147 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/SideNavigation/_channelPricing.html.twig @@ -0,0 +1,7 @@ +{% set product = _context.resource %} + +{% if product.isSimple %} + +{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/SideNavigation/_details.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/SideNavigation/_details.html.twig new file mode 100644 index 0000000000..6c3ffb6f5f --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/SideNavigation/_details.html.twig @@ -0,0 +1,3 @@ + diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/SideNavigation/_inventory.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/SideNavigation/_inventory.html.twig new file mode 100644 index 0000000000..96f0b512b8 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/SideNavigation/_inventory.html.twig @@ -0,0 +1,7 @@ +{% set product = _context.resource %} + +{% if product.isSimple %} + +{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/SideNavigation/_media.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/SideNavigation/_media.html.twig new file mode 100644 index 0000000000..b2099531db --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/SideNavigation/_media.html.twig @@ -0,0 +1,3 @@ + diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/SideNavigation/_taxonomy.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/SideNavigation/_taxonomy.html.twig new file mode 100644 index 0000000000..20f347849c --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/SideNavigation/_taxonomy.html.twig @@ -0,0 +1,3 @@ + diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/SideNavigation/_translations.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/SideNavigation/_translations.html.twig new file mode 100644 index 0000000000..4e14e14746 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/SideNavigation/_translations.html.twig @@ -0,0 +1,3 @@ + diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/_sections.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/_sections.html.twig new file mode 100644 index 0000000000..18f2c9b253 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/_sections.html.twig @@ -0,0 +1,12 @@ +{% set main_event = twig_event_name(_context.main_event, 'sections') %} +{% set fallback_event = twig_event_name(_context.fallback_event, 'sections') %} + +
      +
      + {{ twig_event([main_event, fallback_event], _context|merge({ + main_event: main_event, + fallback_event: fallback_event, + form: _context.form + })) }} +
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/_sideNavigation.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/_sideNavigation.html.twig new file mode 100644 index 0000000000..0fa5544fdd --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/_sideNavigation.html.twig @@ -0,0 +1,10 @@ +{% set main_event = twig_event_name(_context.main_event, 'side_navigation') %} +{% set fallback_event = twig_event_name(_context.fallback_event, 'side_navigation') %} + +
      +
      +
      + {{ twig_event([main_event, fallback_event], _context|merge({ main_event: main_event, fallback_event: fallback_event })) }} +
      +
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/formBody.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/formBody.html.twig new file mode 100644 index 0000000000..22d0dbef8d --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/formBody.html.twig @@ -0,0 +1,13 @@ +{% set main_event = twig_event_name(_context.main_event, 'form_body') %} +{% set fallback_event = twig_event_name(_context.fallback_event, 'form_body') %} + +
      + {{ form_errors(form) }} + {{ form_widget(form._token) }} + + {{ twig_event([main_event, fallback_event], _context|merge({ + main_event: main_event, + fallback_event: fallback_event, + form: _context.form, + })) }} +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/Header/TitleBlock/_title.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/Header/TitleBlock/_title.html.twig new file mode 100644 index 0000000000..66d0c9b14d --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/Header/TitleBlock/_title.html.twig @@ -0,0 +1,7 @@ +{% set product = _context.resource %} + +
      +
      +

      {{ product.name }}

      +
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/Taxonomy/_mainTaxon.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/Taxonomy/_mainTaxon.html.twig new file mode 100644 index 0000000000..87f9ba7c81 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/Taxonomy/_mainTaxon.html.twig @@ -0,0 +1,10 @@ +
      +
      {{ 'sylius.ui.main_taxon'|trans }}:
      +
      + {% if product.mainTaxon is null %} + {{ 'sylius.ui.no_main_taxon'|trans }} + {% else %} + {{ product.mainTaxon.fullName }} + {% endif %} +
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/Taxonomy/_productTaxons.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/Taxonomy/_productTaxons.html.twig new file mode 100644 index 0000000000..5055283b3a --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/Taxonomy/_productTaxons.html.twig @@ -0,0 +1,8 @@ +
      +
      {{ 'sylius.ui.product_taxons'|trans }}:
      +
      + {% for productTaxon in product.productTaxons %} +
      {{ productTaxon.taxon.fullName }}
      + {% endfor %} +
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/TranslationContent/_description.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/TranslationContent/_description.html.twig new file mode 100644 index 0000000000..46525b9d75 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/TranslationContent/_description.html.twig @@ -0,0 +1,4 @@ +
      +
      {{ 'sylius.ui.description'|trans }}:
      +
      {{ productTranslation.description }}
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/TranslationContent/_metaDescription.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/TranslationContent/_metaDescription.html.twig new file mode 100644 index 0000000000..ebcb52f36d --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/TranslationContent/_metaDescription.html.twig @@ -0,0 +1,4 @@ +
      +
      {{ 'sylius.ui.meta_description'|trans }}:
      +
      {{ productTranslation.metaDescription }}
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/TranslationContent/_metaKeywords.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/TranslationContent/_metaKeywords.html.twig new file mode 100644 index 0000000000..065e86f71a --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/TranslationContent/_metaKeywords.html.twig @@ -0,0 +1,4 @@ +
      +
      {{ 'sylius.ui.meta_keywords'|trans }}:
      +
      {{ productTranslation.metaKeywords }}
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/TranslationContent/_name.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/TranslationContent/_name.html.twig new file mode 100644 index 0000000000..246a9d83cd --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/TranslationContent/_name.html.twig @@ -0,0 +1,4 @@ +
      +
      {{ 'sylius.ui.name'|trans }}:
      +
      {{ productTranslation.name }}
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/TranslationContent/_shortDescription.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/TranslationContent/_shortDescription.html.twig new file mode 100644 index 0000000000..14d8f81483 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/TranslationContent/_shortDescription.html.twig @@ -0,0 +1,4 @@ +
      +
      {{ 'sylius.form.product.short_description'|trans }}:
      +
      {{ productTranslation.shortDescription }}
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/TranslationContent/_slug.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/TranslationContent/_slug.html.twig new file mode 100644 index 0000000000..ed27063dd1 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/TranslationContent/_slug.html.twig @@ -0,0 +1,4 @@ +
      +
      {{ 'sylius.ui.slug'|trans }}:
      +
      {{ productTranslation.slug }}
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/_associations.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/_associations.html.twig new file mode 100644 index 0000000000..26e6a3c795 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/_associations.html.twig @@ -0,0 +1,23 @@ +{% set product = _context.resource %} + +
      +
      +
      + {{ 'sylius.ui.associations'|trans }} +
      +
      +
      + {% if product.associations is empty %} + {{ 'sylius.ui.no_associations_to_display'|trans }} + {% else %} + {% for association in product.associations %} + {{ association.type.name }}: +
        + {% for associatedProduct in association.associatedProducts %} +
      • {{ associatedProduct.name }}
        • + {% endfor %} +
      + {% endfor %} + {% endif %} +
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/_details.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/_details.html.twig new file mode 100644 index 0000000000..b5c16c1749 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/_details.html.twig @@ -0,0 +1,209 @@ +{% from '@SyliusAdmin/Shared/Helper/icon.html.twig' import icon as _icon %} +{% import '@SyliusAdmin/Shared/Helper/money.html.twig' as _money %} + +{% set product = _context.resource %} +{% set channels = [] %} +{% for channel in product.channels %} + {% set channels = channels|merge({ (channel.code): channel }) %} +{% endfor %} + +
      +
      +
      + {{ 'sylius.ui.details'|trans }} +
      +
      +
      + + + + + + + + + + + + + + + + {% for variant in product.variants %} + + + + + + + + + + + + + + + {% endfor %} + +
      {{ 'sylius.ui.product'|trans }}{{ 'sylius.ui.enabled'|trans }}{{ 'sylius.ui.options'|trans }}{{ 'sylius.ui.tracked'|trans }}{{ 'sylius.ui.shipping_required'|trans }}{{ 'sylius.ui.tax_category'|trans }}{{ 'sylius.ui.current_stock'|trans }}
      + + +
      +
      + {% if product.imagesByType('thumbnail') is not empty %} + {% set path = product.imagesByType('thumbnail').first.path|imagine_filter(filter|default('sylius_admin_product_thumbnail')) %} + {% elseif product.images.first %} + {% set path = product.images.first.path|imagine_filter(filter|default('sylius_admin_product_thumbnail')) %} + {% else %} + {% set path = asset('build/admin/images/200x200.png', 'admin') %} + {% endif %} + + {{ product.name }} +
      +
      +
      {{ variant.name }}
      +
      {{ variant.code }}
      +
      +
      +       		+ + {% include '@SyliusAdmin/Shared/Grid/Field/boolean.html.twig' with { data: variant.enabled } %} + + +
      + {% for option in variant.optionValues %} + {{ option.name }}: {{ option.value }} + {% endfor %} +
      +       		+ + {% include '@SyliusAdmin/Shared/Grid/Field/boolean.html.twig' with { data: variant.tracked } %} + + + + {% include '@SyliusAdmin/Shared/Grid/Field/boolean.html.twig' with { data: variant.shippingRequired } %} + + {{ variant.taxCategory }}{{ variant.onHand }} + + {{ _icon({ icon: 'pencil' }) }} + {{ 'sylius.ui.edit'|trans }} + +
      +
      +
      +
      +
      {{ 'sylius.ui.pricing'|trans }}
      +
      +
      + + + + + + + + + + + + + {% for channelPricing in variant.channelPricings %} + {% set channel = attribute(channels, channelPricing.channelCode) %} + {% set currencyCode = channel.baseCurrency.code %} + {% set price = channelPricing.price %} + {% set originalPrice = channelPricing.originalPrice ?? 0 %} + {% set lowestPriceBeforeDiscount = channelPricing.lowestPriceBeforeDiscount ?? 0 %} + + + + + + + + + + {% endfor %} + +
      {{ 'sylius.ui.channel'|trans }}{{ 'sylius.ui.price'|trans }}{{ 'sylius.ui.original_price'|trans }}{{ 'sylius.ui.lowest_price_before_discount'|trans }}{{ 'sylius.ui.discounted_by'|trans }}
      + + {{ channel.name }} + {{ _money.format(price, currencyCode) }}{{ _money.format(originalPrice, currencyCode) }}{{ _money.format(lowestPriceBeforeDiscount, currencyCode) }} +
        + {% for promotion in channelPricing.appliedPromotions %} +
      • {{ promotion.name }}
        • + {% endfor %} +
      +       		+ + {{ 'sylius.ui.price_history'|trans }} + +
      +
      +
      +
      +
      +
      {{ 'sylius.ui.shipping'|trans }}
      +
      +
      +
      +
      +
      {{ 'sylius.ui.shipping_category'|trans }}:
      +
      + {% if variant.shippingCategory is null %} + {{ 'sylius.ui.no_shipping_category'|trans }} + {% else %} + {{ variant.shippingCategory }} + {% endif %} +
      +
      +
      +
      {{ 'sylius.ui.width'|trans }}:
      +
      + {% if variant.width is null %} + {{ 'sylius.ui.no_width'|trans }} + {% else %} + {{ variant.width }} + {% endif %} +
      +
      +
      +
      {{ 'sylius.ui.height'|trans }}:
      +
      + {% if variant.height is null %} + {{ 'sylius.ui.no_height'|trans }} + {% else %} + {{ variant.height }} + {% endif %} +
      +
      +
      +
      {{ 'sylius.ui.depth'|trans }}:
      +
      + {% if variant.depth is null %} + {{ 'sylius.ui.no_depth'|trans }} + {% else %} + {{ variant.depth }} + {% endif %} +
      +
      +
      +
      {{ 'sylius.ui.weight'|trans }}:
      +
      + {% if variant.weight is null %} + {{ 'sylius.ui.no_weight'|trans }} + {% else %} + {{ variant.weight }} + {% endif %} +
      +
      +
      +
      +
      +
      +
      +
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/_taxonomy.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/_taxonomy.html.twig new file mode 100644 index 0000000000..119efc94d1 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/_taxonomy.html.twig @@ -0,0 +1,16 @@ +{% set main_event = twig_event_name(main_event, 'taxonomy') %} +{% set fallback_event = twig_event_name(fallback_event, 'taxonomy') %} +{% set product = _context.resource %} + +
      +
      +
      + {{ 'sylius.ui.taxonomy'|trans }} +
      +
      +
      +
      + {{ twig_event([main_event, fallback_event], _context|merge({ main_event: main_event, fallback_event: fallback_event })) }} +
      +
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/_translations.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/_translations.html.twig new file mode 100644 index 0000000000..df503d3416 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/PageBody/_translations.html.twig @@ -0,0 +1,36 @@ +{% set main_event = twig_event_name(_context.main_event, 'translations', 'translation_content') %} +{% set fallback_event = twig_event_name(_context.fallback_event, 'translations', 'translation_content') %} +{% set product = _context.resource %} + +
      +
      + {% for productTranslation in product.translations %} + {% set locale = productTranslation.locale %} + +
      +

      + +

      +
      +
      +
      +
      +
      +
      {{ 'sylius.ui.content'|trans }}
      +
      +
      +
      + {{ twig_event([main_event, fallback_event], _context|merge({ main_event: main_event, fallback_event: fallback_event })) }} +
      +
      +
      +
      +
      +
      +
      + {% endfor %} +
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/_pageBody.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/_pageBody.html.twig new file mode 100644 index 0000000000..578b2b8a67 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/Content/_pageBody.html.twig @@ -0,0 +1,11 @@ +{% set main_event = twig_event_name(main_event, 'page_body') %} +{% set fallback_event = twig_event_name(fallback_event, 'page_body') %} + +
      +
      + {{ twig_event( + [main_event, fallback_event], + _context|merge({ main_event: main_event, fallback_event: fallback_event }) + ) }} +
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Update/Header/TitleBlock/Actions/More/_viewInStore.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Update/Header/TitleBlock/Actions/More/_viewInStore.html.twig new file mode 100644 index 0000000000..21fd092089 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Update/Header/TitleBlock/Actions/More/_viewInStore.html.twig @@ -0,0 +1,8 @@ +{% from '@SyliusAdmin/Shared/Helper/icon.html.twig' import icon as _icon %} + +
    3. + + {{ _icon({ icon: 'arrow-up-right', class: 'icon dropdown-item-icon icon-tabler' }) }} + {{ 'sylius.ui.view_in_store'|trans }} + +
      4. diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Update/Header/TitleBlock/Actions/_cancel.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Update/Header/TitleBlock/Actions/_cancel.html.twig new file mode 100644 index 0000000000..7317bdc21d --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Update/Header/TitleBlock/Actions/_cancel.html.twig @@ -0,0 +1,8 @@ +{% import '@SyliusAdmin/Shared/Helper/button.html.twig' as _button %} + +{% set index_url = path( + configuration.vars.index.route.name|default(configuration.getRouteName('index')), + configuration.vars.index.route.parameters|default(configuration.vars.route.parameters|default({})) +) %} + +{{ _button.cancel({ text: 'sylius.ui.cancel'|trans, url: index_url, class: 'btn' }) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Update/Header/TitleBlock/Actions/_more.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Update/Header/TitleBlock/Actions/_more.html.twig new file mode 100644 index 0000000000..f1a5ea8d76 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Update/Header/TitleBlock/Actions/_more.html.twig @@ -0,0 +1,11 @@ +{% set main_event = twig_event_name(_context.main_event, 'more') %} +{% set fallback_event = twig_event_name(_context.fallback_event, 'more') %} + +
      + +
        + {{ twig_event([main_event, fallback_event], _context|merge({ main_event: main_event, fallback_event: fallback_event })) }} +
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Update/Header/TitleBlock/Actions/_update.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Update/Header/TitleBlock/Actions/_update.html.twig new file mode 100644 index 0000000000..825aaa3fda --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Update/Header/TitleBlock/Actions/_update.html.twig @@ -0,0 +1,3 @@ +{% import '@SyliusAdmin/Shared/Helper/button.html.twig' as _button %} + +{{ _button.primary({ text: 'sylius.ui.update'|trans, type: 'submit', form: form.vars.id }) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Update/Header/TitleBlock/_actions.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Update/Header/TitleBlock/_actions.html.twig new file mode 100644 index 0000000000..62f6aedb73 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Update/Header/TitleBlock/_actions.html.twig @@ -0,0 +1,10 @@ +{% import '@SyliusAdmin/Shared/Helper/button.html.twig' as _button %} + +{% set main_event = twig_event_name(_context.main_event, 'actions') %} +{% set fallback_event = twig_event_name(_context.fallback_event, 'actions') %} + +
      +
      + {{ twig_event([main_event, fallback_event], _context|merge({ main_event: main_event, fallback_event: fallback_event })) }} +
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Security/Login/Content/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Security/Login/Content/_form.html.twig index a20b01c320..ba970c68ed 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Security/Login/Content/_form.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Security/Login/Content/_form.html.twig @@ -1,4 +1,4 @@ -{% form_theme form 'bootstrap_5_layout.html.twig' %} +{% form_theme form '@SyliusAdmin/Shared/form_theme.html.twig' %} {% set event_name = _context.event_prefix ~ '.form' %} {{ form_start(form, {'action': path('sylius_admin_login_check'), 'attr': {'class': 'ui large loadable form', 'novalidate': 'novalidate'}}) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/_header.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/_header.html.twig index de4c8a2fad..760efed693 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/_header.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/_header.html.twig @@ -1,7 +1,7 @@ {% set main_event = _context.main_event ~ '.header' %} {% set fallback_event = _context.fallback_event ~ '.header' %} -
      +
      {{ twig_event( [main_event, fallback_event], diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Create/Content/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Create/Content/_form.html.twig index ac4ecc39dc..10af96f687 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Create/Content/_form.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Create/Content/_form.html.twig @@ -1,4 +1,4 @@ -{% form_theme form 'bootstrap_5_layout.html.twig' %} +{% form_theme form '@SyliusAdmin/Shared/form_theme.html.twig' %} {% import '@SyliusAdmin/Shared/Helper/button.html.twig' as _button %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Update/Content/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Update/Content/_form.html.twig index 328295f2a8..224cc46119 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Update/Content/_form.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Update/Content/_form.html.twig @@ -1,12 +1,12 @@ -{% form_theme form 'bootstrap_5_layout.html.twig' %} +{% form_theme form '@SyliusAdmin/Shared/form_theme.html.twig' %} {% import '@SyliusAdmin/Shared/Helper/button.html.twig' as _button %} {% set main_event = _context.main_event ~ '.form' %} {% set fallback_event = _context.fallback_event ~ '.form' %} -{% set route = _context.configuration.vars.route %} -{% set indexRoute = _context.configuration.vars.index.route %} +{% set route = _context.configuration.vars.route|default(null) %} +{% set indexRoute = _context.configuration.vars.index.route|default(null) %} {% set index_url = path( indexRoute.name|default(_context.configuration.getRouteName('index')), indexRoute.parameters|default(route.parameters|default({})) diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/create.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/create.html.twig index b657abae1b..c764478b91 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/create.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/create.html.twig @@ -1,7 +1,7 @@ {% extends '@SyliusAdmin/Shared/Layout/base.html.twig' %} {% set main_event = _context.metadata.applicationName ~ '.admin.' ~ _context.metadata.name ~ '.create' %} -{% set fallback_event = _context.metadata.applicationName ~ '.admin.' ~ 'create.body' %} +{% set fallback_event = _context.metadata.applicationName ~ '.admin.' ~ 'create' %} {% set header = configuration.vars.header|default(_context.metadata.applicationName ~ '.ui.' ~ _context.metadata.pluralName) %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_boolean.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_boolean.html.twig index 2fe9d2f6f1..4ef465dbaa 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_boolean.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_boolean.html.twig @@ -1,3 +1,3 @@ -{% form_theme form 'bootstrap_5_layout.html.twig' %} +{% form_theme form '@SyliusAdmin/Shared/form_theme.html.twig' %} {{ form_row(form, {'label': filter.label}) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_date.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_date.html.twig index b6d6d14bd7..f0baa91593 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_date.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_date.html.twig @@ -1,4 +1,4 @@ -{% form_theme form 'bootstrap_5_layout.html.twig' %} +{% form_theme form '@SyliusAdmin/Shared/form_theme.html.twig' %}
      {{ form_row(form.from, { attr: {'class': 'sylius-filters__group'}, 'label': 'sylius.ui.date_filter', 'label_translation_parameters': {'%label%': filter.label|trans, '%altLabel%': form.from.vars.label|trans} }) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_entities.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_entities.html.twig index 2fe9d2f6f1..4ef465dbaa 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_entities.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_entities.html.twig @@ -1,3 +1,3 @@ -{% form_theme form 'bootstrap_5_layout.html.twig' %} +{% form_theme form '@SyliusAdmin/Shared/form_theme.html.twig' %} {{ form_row(form, {'label': filter.label}) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_entity.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_entity.html.twig index 2fe9d2f6f1..4ef465dbaa 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_entity.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_entity.html.twig @@ -1,3 +1,3 @@ -{% form_theme form 'bootstrap_5_layout.html.twig' %} +{% form_theme form '@SyliusAdmin/Shared/form_theme.html.twig' %} {{ form_row(form, {'label': filter.label}) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_exists.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_exists.html.twig index 2fe9d2f6f1..4ef465dbaa 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_exists.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_exists.html.twig @@ -1,3 +1,3 @@ -{% form_theme form 'bootstrap_5_layout.html.twig' %} +{% form_theme form '@SyliusAdmin/Shared/form_theme.html.twig' %} {{ form_row(form, {'label': filter.label}) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_money.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_money.html.twig index ac7cd7257b..adaaefca19 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_money.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_money.html.twig @@ -1,4 +1,4 @@ -{% form_theme form 'bootstrap_5_layout.html.twig' %} +{% form_theme form '@SyliusAdmin/Shared/form_theme.html.twig' %}
      {{ form_row(form.greaterThan, {attr: {'placeholder': form.greaterThan.vars.label}, 'label': 'sylius.ui.money_filter', 'label_translation_parameters': {'%label%': filter.label|trans, '%altLabel%': form.greaterThan.vars.label|trans}}) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_resourceAutocomplete.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_resourceAutocomplete.html.twig index 458236c349..8894e517da 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_resourceAutocomplete.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_resourceAutocomplete.html.twig @@ -1,3 +1,3 @@ -{% form_theme form 'bootstrap_5_layout.html.twig' %} +{% form_theme form '@SyliusAdmin/Shared/form_theme.html.twig' %} {{ form_row(form, {'label': filter.label, 'remote_url': path(filter.formOptions.remote_path), 'load_edit_url': path(filter.formOptions.load_edit_path)}) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_select.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_select.html.twig index 2fe9d2f6f1..4ef465dbaa 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_select.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_select.html.twig @@ -1,3 +1,3 @@ -{% form_theme form 'bootstrap_5_layout.html.twig' %} +{% form_theme form '@SyliusAdmin/Shared/form_theme.html.twig' %} {{ form_row(form, {'label': filter.label}) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_string.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_string.html.twig index 8d2c0b7f2a..e94da090f0 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_string.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Filter/_string.html.twig @@ -1,4 +1,4 @@ -{% form_theme form 'bootstrap_5_layout.html.twig' %} +{% form_theme form '@SyliusAdmin/Shared/form_theme.html.twig' %}
      {% if form.type is defined %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/form_theme.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/form_theme.html.twig new file mode 100644 index 0000000000..2b86b3f1c4 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/form_theme.html.twig @@ -0,0 +1,21 @@ +{% extends 'bootstrap_5_layout.html.twig' %} + +{% block sylius_resource_autocomplete_choice_row %} +
      + {{- form_label(form) -}} + + {{ form_widget(form) }} + {{- form_errors(form) -}} +
      +{% endblock %} diff --git a/src/Sylius/Bundle/ProductBundle/Doctrine/ORM/ProductOptionRepository.php b/src/Sylius/Bundle/ProductBundle/Doctrine/ORM/ProductOptionRepository.php index cbb6707c54..52e519cdf0 100644 --- a/src/Sylius/Bundle/ProductBundle/Doctrine/ORM/ProductOptionRepository.php +++ b/src/Sylius/Bundle/ProductBundle/Doctrine/ORM/ProductOptionRepository.php @@ -47,7 +47,7 @@ class ProductOptionRepository extends EntityRepository implements ProductOptionR ; } - public function findByPhrase(string $phrase, string $locale, int $limit = 10): array + public function findByPhrase(string $phrase, string $locale, int $limit = 10, ?array $excludes = null): array { $subqueryBuilder = $this->createQueryBuilder('sq') ->innerJoin('sq.translations', 'translation', 'WITH', 'translation.name LIKE :name') @@ -58,6 +58,12 @@ class ProductOptionRepository extends EntityRepository implements ProductOptionR $queryBuilder = $this->createQueryBuilder('o'); + if (null !== $excludes) { + $queryBuilder + ->andWhere($queryBuilder->expr()->notIn('o.code', $excludes)) + ; + } + /** @var ProductOptionInterface[] $results */ $results = $queryBuilder ->andWhere($queryBuilder->expr()->in('o', $subqueryBuilder->getDQL())) diff --git a/src/Sylius/Bundle/TaxonomyBundle/Doctrine/ORM/TaxonRepository.php b/src/Sylius/Bundle/TaxonomyBundle/Doctrine/ORM/TaxonRepository.php index da6df11cdb..8f232ce4a3 100644 --- a/src/Sylius/Bundle/TaxonomyBundle/Doctrine/ORM/TaxonRepository.php +++ b/src/Sylius/Bundle/TaxonomyBundle/Doctrine/ORM/TaxonRepository.php @@ -123,7 +123,7 @@ class TaxonRepository extends EntityRepository implements TaxonRepositoryInterfa return $this->findRootNodes(); } - public function findByNamePart(string $phrase, ?string $locale = null, ?int $limit = null): array + public function findByNamePart(string $phrase, ?string $locale = null, ?int $limit = null, ?array $excludes = null): array { $subqueryBuilder = $this->createQueryBuilder('sq') ->innerJoin('sq.translations', 'translation', 'WITH', 'translation.name LIKE :name') @@ -134,6 +134,13 @@ class TaxonRepository extends EntityRepository implements TaxonRepositoryInterfa $queryBuilder = $this->createQueryBuilder('o'); + if (null !== $excludes) { + $queryBuilder + ->andWhere($queryBuilder->expr()->notIn('o.code', ':excludes')) + ->setParameter('excludes', $excludes) + ; + } + /** @var TaxonInterface[] $results */ $results = $queryBuilder ->andWhere($queryBuilder->expr()->in('o', $subqueryBuilder->getDQL())) diff --git a/src/Sylius/Component/Product/Repository/ProductOptionRepositoryInterface.php b/src/Sylius/Component/Product/Repository/ProductOptionRepositoryInterface.php index b8d1bc6a7a..113b72a3ff 100644 --- a/src/Sylius/Component/Product/Repository/ProductOptionRepositoryInterface.php +++ b/src/Sylius/Component/Product/Repository/ProductOptionRepositoryInterface.php @@ -32,9 +32,11 @@ interface ProductOptionRepositoryInterface extends RepositoryInterface public function findByName(string $name, string $locale): array; /** + * @param array|null $excludes + * * @return ProductOptionInterface[] */ - public function findByPhrase(string $phrase, string $locale, int $limit = 10): array; + public function findByPhrase(string $phrase, string $locale, int $limit = 10, ?array $excludes = null): array; /** * @param string[] $codes diff --git a/src/Sylius/Component/Taxonomy/Repository/TaxonRepositoryInterface.php b/src/Sylius/Component/Taxonomy/Repository/TaxonRepositoryInterface.php index d7962bfae2..0ef37cc8cb 100644 --- a/src/Sylius/Component/Taxonomy/Repository/TaxonRepositoryInterface.php +++ b/src/Sylius/Component/Taxonomy/Repository/TaxonRepositoryInterface.php @@ -46,9 +46,11 @@ interface TaxonRepositoryInterface extends RepositoryInterface public function findByName(string $name, string $locale): array; /** + * @param array|null $excludes + * * @return array|TaxonInterface[] */ - public function findByNamePart(string $phrase, ?string $locale = null, ?int $limit = null): array; + public function findByNamePart(string $phrase, ?string $locale = null, ?int $limit = null, ?array $excludes = null): array; public function createListQueryBuilder(): QueryBuilder; } From 06e365e9bf7f360b47e67a3be21520d8c4d41f0a Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Wed, 18 Oct 2023 16:28:15 +0200 Subject: [PATCH 040/166] Add a taxon's create and update actions --- .../Resources/config/app/template_events.yaml | 1 + .../config/app/template_events/crud.yaml | 16 + .../config/app/template_events/product.yaml | 19 +- .../app/template_events/taxon/create.yaml | 30 ++ .../app/template_events/taxon/update.yaml | 30 ++ .../Resources/config/routing/taxon.yml | 2 +- .../Resources/translations/messages.en.yml | 1 + .../Form/Sections/_translations.html.twig | 22 +- .../TitleBlock/Actions/_cancel.html.twig | 8 - .../TitleBlock/Actions/_cancel.html.twig | 0 .../TitleBlock/Actions/_create.html.twig | 0 .../TitleBlock/Actions/_update.html.twig | 0 .../Header/TitleBlock/_actions.html.twig | 0 .../Crud/Create/Content/_form.html.twig | 36 +- .../Header/TitleBlock/_actions.html.twig | 0 .../Shared/Helper/translations.html.twig | 25 ++ .../views/Shared/form_theme.html.twig | 2 +- .../Form/Sections/Details/_code.html.twig | 1 + .../Form/Sections/Details/_enabled.html.twig | 1 + .../Form/Sections/Details/_parent.html.twig | 5 + .../Taxon/Form/Sections/_details.html.twig | 8 + .../Taxon/Form/Sections/_media.html.twig | 29 ++ .../Form/Sections/_translations.html.twig | 5 + .../views/Taxon/Form/_sections.html.twig | 6 + .../views/Taxon/Form/_tree.html.twig | 401 ++++++++++++++++++ .../Resources/views/Taxon/_form.html.twig | 10 + 26 files changed, 595 insertions(+), 63 deletions(-) create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/taxon/create.yaml create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/taxon/update.yaml delete mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Product/Update/Header/TitleBlock/Actions/_cancel.html.twig rename src/Sylius/Bundle/AdminBundle/Resources/views/{Product/Create => Shared/Crud/Common/Content}/Header/TitleBlock/Actions/_cancel.html.twig (100%) rename src/Sylius/Bundle/AdminBundle/Resources/views/{Product/Create => Shared/Crud/Common/Content}/Header/TitleBlock/Actions/_create.html.twig (100%) rename src/Sylius/Bundle/AdminBundle/Resources/views/{Product/Update => Shared/Crud/Common/Content}/Header/TitleBlock/Actions/_update.html.twig (100%) rename src/Sylius/Bundle/AdminBundle/Resources/views/{Product/Create => Shared/Crud/Create/Content}/Header/TitleBlock/_actions.html.twig (100%) rename src/Sylius/Bundle/AdminBundle/Resources/views/{Product/Update => Shared/Crud/Update/Content}/Header/TitleBlock/_actions.html.twig (100%) create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/translations.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/Sections/Details/_code.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/Sections/Details/_enabled.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/Sections/Details/_parent.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/Sections/_details.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/Sections/_media.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/Sections/_translations.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/_sections.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/_tree.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/_form.html.twig diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml index a1c81d71c0..3618c1e8fa 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events.yaml @@ -3,6 +3,7 @@ imports: - { resource: 'template_events/*.yaml' } + - { resource: 'template_events/**/*.yaml' } sylius_ui: events: diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/crud.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/crud.yaml index 79609d03be..38a20bc9e3 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/crud.yaml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/crud.yaml @@ -77,6 +77,14 @@ sylius_ui: blocks: title: template: '@SyliusAdmin/Shared/Crud/Create/Content/Header/TitleBlock/_title.html.twig' + actions: + template: '@SyliusAdmin/Shared/Crud/Create/Content/Header/TitleBlock/_actions.html.twig' + sylius.admin.create.content.header.title_block.actions: + blocks: + cancel: + template: '@SyliusAdmin/Shared/Crud/Common/Content/Header/TitleBlock/Actions/_cancel.html.twig' + create: + template: '@SyliusAdmin/Shared/Crud/Common/Content/Header/TitleBlock/Actions/_create.html.twig' # Update sylius.admin.update: @@ -107,6 +115,14 @@ sylius_ui: blocks: title: template: '@SyliusAdmin/Shared/Crud/Update/Content/Header/TitleBlock/_title.html.twig' + actions: + template: '@SyliusAdmin/Shared/Crud/Update/Content/Header/TitleBlock/_actions.html.twig' + sylius.admin.update.content.header.title_block.actions: + blocks: + cancel: + template: '@SyliusAdmin/Shared/Crud/Common/Content/Header/TitleBlock/Actions/_cancel.html.twig' + update: + template: '@SyliusAdmin/Shared/Crud/Common/Content/Header/TitleBlock/Actions/_update.html.twig' # Show sylius.admin.show: diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/product.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/product.yaml index 2638b0c3dd..9acef37998 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/product.yaml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/product.yaml @@ -46,18 +46,11 @@ sylius_ui: form: context: render_rest: false - sylius.admin.product.update.content.header.title_block: - blocks: - actions: - template: '@SyliusAdmin/Product/Update/Header/TitleBlock/_actions.html.twig' sylius.admin.product.update.content.header.title_block.actions: blocks: more: template: '@SyliusAdmin/Product/Update/Header/TitleBlock/Actions/_more.html.twig' - cancel: - template: '@SyliusAdmin/Product/Update/Header/TitleBlock/Actions/_cancel.html.twig' - create: - template: '@SyliusAdmin/Product/Update/Header/TitleBlock/Actions/_update.html.twig' + priority: 128 sylius.admin.product.update.content.header.title_block.actions.more: blocks: view_in_store: @@ -112,16 +105,6 @@ sylius_ui: form: context: render_rest: false - sylius.admin.product.create.content.header.title_block: - blocks: - actions: - template: '@SyliusAdmin/Product/Create/Header/TitleBlock/_actions.html.twig' - sylius.admin.product.create.content.header.title_block.actions: - blocks: - cancel: - template: '@SyliusAdmin/Product/Create/Header/TitleBlock/Actions/_cancel.html.twig' - create: - template: '@SyliusAdmin/Product/Create/Header/TitleBlock/Actions/_create.html.twig' sylius.admin.product.create.content.form: blocks: form_body: diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/taxon/create.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/taxon/create.yaml new file mode 100644 index 0000000000..4087bef44d --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/taxon/create.yaml @@ -0,0 +1,30 @@ +sylius_ui: + events: + sylius.admin.taxon.create.content: + blocks: + form: + template: '@SyliusAdmin/Taxon/_form.html.twig' + context: + render_rest: false + sylius.admin.taxon.create.content.form: + blocks: + tree: + template: '@SyliusAdmin/Taxon/Form/_tree.html.twig' + sections: + template: '@SyliusAdmin/Taxon/Form/_sections.html.twig' + sylius.admin.taxon.create.content.form.sections: + blocks: + details: + template: '@SyliusAdmin/Taxon/Form/Sections/_details.html.twig' + translations: + template: '@SyliusAdmin/Taxon/Form/Sections/_translations.html.twig' + media: + template: '@SyliusAdmin/Taxon/Form/Sections/_media.html.twig' + sylius.admin.taxon.create.content.form.sections.details: + blocks: + code: + template: '@SyliusAdmin/Taxon/Form/Sections/Details/_code.html.twig' + parent: + template: '@SyliusAdmin/Taxon/Form/Sections/Details/_parent.html.twig' + enabled: + template: '@SyliusAdmin/Taxon/Form/Sections/Details/_enabled.html.twig' diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/taxon/update.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/taxon/update.yaml new file mode 100644 index 0000000000..659471074e --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/taxon/update.yaml @@ -0,0 +1,30 @@ +sylius_ui: + events: + sylius.admin.taxon.update.content: + blocks: + form: + template: '@SyliusAdmin/Taxon/_form.html.twig' + context: + render_rest: false + sylius.admin.taxon.update.content.form: + blocks: + tree: + template: '@SyliusAdmin/Taxon/Form/_tree.html.twig' + sections: + template: '@SyliusAdmin/Taxon/Form/_sections.html.twig' + sylius.admin.taxon.update.content.form.sections: + blocks: + details: + template: '@SyliusAdmin/Taxon/Form/Sections/_details.html.twig' + translations: + template: '@SyliusAdmin/Taxon/Form/Sections/_translations.html.twig' + media: + template: '@SyliusAdmin/Taxon/Form/Sections/_media.html.twig' + sylius.admin.taxon.update.content.form.sections.details: + blocks: + code: + template: '@SyliusAdmin/Taxon/Form/Sections/Details/_code.html.twig' + parent: + template: '@SyliusAdmin/Taxon/Form/Sections/Details/_parent.html.twig' + enabled: + template: '@SyliusAdmin/Taxon/Form/Sections/Details/_enabled.html.twig' diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/taxon.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/taxon.yml index b3fe5d6093..e15beaba6d 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/taxon.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/taxon.yml @@ -2,7 +2,7 @@ sylius_admin_taxon: resource: | alias: sylius.taxon section: admin - templates: "@SyliusAdmin\\Taxon" + templates: "@SyliusAdmin\\Shared\\Crud" except: ['show', 'index'] redirect: update permission: true diff --git a/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.en.yml b/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.en.yml index 4338e26c90..203d9ad46a 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.en.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.en.yml @@ -96,5 +96,6 @@ sylius: week: Week 2weeks: 2 Weeks year: Year + taxon: Taxon view_in_store: 'View in store' work_in_progress: Work in progress diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_translations.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_translations.html.twig index a2c6646828..3d5e632cfd 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_translations.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Form/Sections/_translations.html.twig @@ -1,23 +1,7 @@ +{% import '@SyliusAdmin/Shared/Helper/translations.html.twig' as _translations %} +
      -
      - {% for locale, translationForm in form.translations %} -
      -

      - -

      -
      -
      - {% for field in translationForm %} - {{ form_row(field) }} - {% endfor %} -
      -
      -
      - {% endfor %} -
      + {{ _translations.default(form.translations) }}
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Update/Header/TitleBlock/Actions/_cancel.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Update/Header/TitleBlock/Actions/_cancel.html.twig deleted file mode 100644 index 7317bdc21d..0000000000 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Update/Header/TitleBlock/Actions/_cancel.html.twig +++ /dev/null @@ -1,8 +0,0 @@ -{% import '@SyliusAdmin/Shared/Helper/button.html.twig' as _button %} - -{% set index_url = path( - configuration.vars.index.route.name|default(configuration.getRouteName('index')), - configuration.vars.index.route.parameters|default(configuration.vars.route.parameters|default({})) -) %} - -{{ _button.cancel({ text: 'sylius.ui.cancel'|trans, url: index_url, class: 'btn' }) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Create/Header/TitleBlock/Actions/_cancel.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/Header/TitleBlock/Actions/_cancel.html.twig similarity index 100% rename from src/Sylius/Bundle/AdminBundle/Resources/views/Product/Create/Header/TitleBlock/Actions/_cancel.html.twig rename to src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/Header/TitleBlock/Actions/_cancel.html.twig diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Create/Header/TitleBlock/Actions/_create.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/Header/TitleBlock/Actions/_create.html.twig similarity index 100% rename from src/Sylius/Bundle/AdminBundle/Resources/views/Product/Create/Header/TitleBlock/Actions/_create.html.twig rename to src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/Header/TitleBlock/Actions/_create.html.twig diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Update/Header/TitleBlock/Actions/_update.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/Header/TitleBlock/Actions/_update.html.twig similarity index 100% rename from src/Sylius/Bundle/AdminBundle/Resources/views/Product/Update/Header/TitleBlock/Actions/_update.html.twig rename to src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Common/Content/Header/TitleBlock/Actions/_update.html.twig diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Create/Header/TitleBlock/_actions.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Create/Content/Header/TitleBlock/_actions.html.twig similarity index 100% rename from src/Sylius/Bundle/AdminBundle/Resources/views/Product/Create/Header/TitleBlock/_actions.html.twig rename to src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Create/Content/Header/TitleBlock/_actions.html.twig diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Create/Content/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Create/Content/_form.html.twig index 10af96f687..8081233d31 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Create/Content/_form.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Create/Content/_form.html.twig @@ -14,21 +14,24 @@
      - {% if _context.render_rest %} -
      + {% block content %} + {% if _context.render_rest %} +
      - {% endif %} - {{ form_start(form, {'action': path(configuration.vars.route.name|default(configuration.getRouteName('create')), configuration.vars.route.parameters|default({})), 'attr': {'class': 'ui loadable form', 'novalidate': 'novalidate', 'id': form.vars.id}}) }} - {{ twig_event( - [main_event, fallback_event], - _context|merge({ - main_event: main_event, - fallback_event: fallback_event, - form: form, - }) - ) }} - {{ form_end(form, {'render_rest': _context.render_rest}) }} - {% if _context.render_rest %} + {% endif %} + {{ form_start(form, {'action': path(configuration.vars.route.name|default(configuration.getRouteName('create')), configuration.vars.route.parameters|default({})), 'attr': {'class': 'ui loadable form', 'novalidate': 'novalidate', 'id': form.vars.id}}) }} + {% block form_content %} + {{ twig_event( + [main_event, fallback_event], + _context|merge({ + main_event: main_event, + fallback_event: fallback_event, + form: form, + }) + ) }} + {% endblock %} + {{ form_end(form, {'render_rest': _context.render_rest}) }} + {% if _context.render_rest %}
      @@ -39,7 +42,8 @@
      -
      - {% endif %} +
      + {% endif %} + {% endblock %}
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Update/Header/TitleBlock/_actions.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Update/Content/Header/TitleBlock/_actions.html.twig similarity index 100% rename from src/Sylius/Bundle/AdminBundle/Resources/views/Product/Update/Header/TitleBlock/_actions.html.twig rename to src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Update/Content/Header/TitleBlock/_actions.html.twig diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/translations.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/translations.html.twig new file mode 100644 index 0000000000..4d5c7bb88d --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Helper/translations.html.twig @@ -0,0 +1,25 @@ +{% macro default(translationFields, options = {}) %} + {% set options = { + accordionId: 'product-translations' + }|merge(options) %} + +
      + {% for locale, translationForm in translationFields %} +
      +

      + +

      +
      +
      + {% for field in translationForm %} + {{ form_row(field) }} + {% endfor %} +
      +
      +
      + {% endfor %} +
      +{% endmacro %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/form_theme.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/form_theme.html.twig index 2b86b3f1c4..f8365be55c 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/form_theme.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/form_theme.html.twig @@ -10,7 +10,7 @@ data-choice-value-field="{{ choice_value }}" data-input-id="{{ form.vars.id }}" data-init-url="{{ init_load_url|default(null) }}" - data-search-url="{{ search_url }}" + {% if search_url is defined %}data-search-url="{{ search_url }}"{% endif %} data-no-choices-text="{{ no_choices_translation|default('sylius.ui.start_typing_to_search')|trans }}" {% if form.vars.disabled %}disabled{% endif %} {% if multiple %}multiple{% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/Sections/Details/_code.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/Sections/Details/_code.html.twig new file mode 100644 index 0000000000..5bdc6cb04f --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/Sections/Details/_code.html.twig @@ -0,0 +1 @@ +{{ form_row(form.code) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/Sections/Details/_enabled.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/Sections/Details/_enabled.html.twig new file mode 100644 index 0000000000..0c7011fa3b --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/Sections/Details/_enabled.html.twig @@ -0,0 +1 @@ +{{ form_row(form.enabled, { label_attr: { class: 'checkbox-switch' } }) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/Sections/Details/_parent.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/Sections/Details/_parent.html.twig new file mode 100644 index 0000000000..24bbe6248c --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/Sections/Details/_parent.html.twig @@ -0,0 +1,5 @@ +{{ form_row(form.parent, { + parent_label_class: 'checkbox-switch', + search_url: path('sylius_admin_ajax_taxon_by_name_phrase'), + init_load_url: path('sylius_admin_ajax_taxon_by_code') +}) }} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/Sections/_details.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/Sections/_details.html.twig new file mode 100644 index 0000000000..31884c697a --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/Sections/_details.html.twig @@ -0,0 +1,8 @@ +{% set main_event = twig_event_name(_context.main_event, 'details') %} +{% set fallback_event = twig_event_name(_context.fallback_event, 'details') %} + +
      +
      + {{ twig_event([main_event, fallback_event], _context|merge({ main_event, fallback_event })) }} +
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/Sections/_media.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/Sections/_media.html.twig new file mode 100644 index 0000000000..8a07ae443d --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/Sections/_media.html.twig @@ -0,0 +1,29 @@ +
      +
      +

      + {{ 'sylius.ui.media'|trans }} {{ 'sylius.ui.work_in_progress'|trans }} +

      +
      +
      +
      +
      + +
      +
      +
      + + +
      +
      + + +
      +
      +
      +
      +
      + +
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/Sections/_translations.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/Sections/_translations.html.twig new file mode 100644 index 0000000000..12bbb1a035 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/Sections/_translations.html.twig @@ -0,0 +1,5 @@ +{% import '@SyliusAdmin/Shared/Helper/translations.html.twig' as _translations %} + +
      + {{ _translations.default(_context.form.translations) }} +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/_sections.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/_sections.html.twig new file mode 100644 index 0000000000..cdd1b48d15 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/_sections.html.twig @@ -0,0 +1,6 @@ +{% set main_event = twig_event_name(_context.main_event, 'sections') %} +{% set fallback_event = twig_event_name(_context.fallback_event, 'sections') %} + +
      + {{ twig_event([main_event, fallback_event], _context|merge({ main_event, fallback_event })) }} +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/_tree.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/_tree.html.twig new file mode 100644 index 0000000000..c8117025c7 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/_tree.html.twig @@ -0,0 +1,401 @@ +
      + +
      +
      +
      + +
      + +
      +
      +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/_form.html.twig new file mode 100644 index 0000000000..5f32857d4b --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/_form.html.twig @@ -0,0 +1,10 @@ +{% extends '@SyliusAdmin/Shared/Crud/Create/Content/_form.html.twig' %} + +{% block form_content %} +
      + {{ form_errors(form) }} + {{ form_widget(form._token) }} + + {{ parent() }} +
      +{% endblock %} From ca9f01bd873756ee6c52825519636fdb797b4577 Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Thu, 19 Oct 2023 10:29:14 +0200 Subject: [PATCH 041/166] Add a taxon tree --- .../Resources/assets/entrypoint.js | 1 + .../Resources/assets/scripts/tree.js | 49 ++++++++++++ .../Resources/assets/styles/_tree.scss | 40 ++++++++++ .../Resources/assets/styles/main.scss | 1 + .../app/template_events/taxon/create.yaml | 2 +- .../app/template_events/taxon/update.yaml | 2 +- .../config/services/twig_component.xml | 6 ++ .../views/Taxon/Component/taxonTree.html.twig | 66 +++++++++++++++ .../views/Taxon/Form/_tree.html.twig | 1 - .../views/Taxon/Helper/taxonTree.html.twig | 80 +++++++++++++++++++ .../Taxon/TaxonTreeComponent.php | 37 +++++++++ 11 files changed, 282 insertions(+), 3 deletions(-) create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/assets/scripts/tree.js create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_tree.scss create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Component/taxonTree.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Helper/taxonTree.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/TwigComponent/Taxon/TaxonTreeComponent.php diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/entrypoint.js b/src/Sylius/Bundle/AdminBundle/Resources/assets/entrypoint.js index ada57a3e3d..445e44930a 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/assets/entrypoint.js +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/entrypoint.js @@ -12,6 +12,7 @@ import './styles/main.scss'; import './scripts/choices'; import './scripts/statistics_chart'; import './scripts/sticky-header'; +import './scripts/tree'; import 'bootstrap'; diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/scripts/tree.js b/src/Sylius/Bundle/AdminBundle/Resources/assets/scripts/tree.js new file mode 100644 index 0000000000..5035612904 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/scripts/tree.js @@ -0,0 +1,49 @@ +/* + * This file is part of the Sylius package. + * + * (c) Sylius Sp. z o.o. + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +function syliusTree(tree) { + const toggles = tree.querySelectorAll('[data-js-tree="toggle"]'); + const toggleAllButton = tree.querySelector('[data-js-tree="toggle-all"]'); + + const syliusTreeToggle = function(trigger, open) { + const wrapper = trigger.parentElement; + const list = trigger.nextElementSibling; + + trigger.classList.remove(open ? 'collapsed' : 'expanded'); + trigger.classList.add(open ? 'expanded' : 'collapsed'); + wrapper.classList.remove(open ? 'collapsed' : 'expanded'); + wrapper.classList.add(open ? 'expanded' : 'collapsed'); + list.style.display = open ? 'block' : 'none'; + } + + toggles.forEach(function(toggle) { + const toggleBtn = toggle.querySelector('[data-js-tree="toggle-btn"]'); + syliusTreeToggle(toggle, true); + + if (toggleBtn) { + toggleBtn.addEventListener('click', () => { + syliusTreeToggle(toggle, toggle.nextElementSibling.style.display === 'none'); + }); + } + }); + + if (toggleAllButton) { + toggleAllButton.addEventListener('click', () => { + const isAnyClosed = tree.querySelectorAll('.collapsed').length > 0; + + toggles.forEach(function(toggle) { + syliusTreeToggle(toggle, isAnyClosed); + }); + }) + } +} + +(function() { + document.querySelectorAll('[data-js-tree="container"]').forEach(syliusTree); +})(); diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_tree.scss b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_tree.scss new file mode 100644 index 0000000000..eae0ac7d15 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/_tree.scss @@ -0,0 +1,40 @@ +ul.tree { + margin: 0; + padding: 0; +} + +ul.tree li { + margin: 0; + padding: 3px 0; + list-style-type: none; +} + +ul.tree .tree-header-btn:hover { + cursor: pointer; + text-decoration: underline; +} + +ul.tree .tree-header .tree-icon-down, +ul.tree .tree-header .tree-icon-right { + display: none; +} + +ul.tree .tree-header.expanded .tree-icon-down { + display: inline-block; +} + +ul.tree .tree-header.collapsed .tree-icon-right { + display: inline-block; +} + +ul.tree .tree-icon { + display: inline-flex; + align-items: center; + justify-content: start; + width: 15px; + height: 20px; +} + +ul.tree .tree-icon svg { + stroke-width: 1px; +} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/main.scss b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/main.scss index 67c6689596..56f0e397e5 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/main.scss +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/styles/main.scss @@ -29,3 +29,4 @@ body { @import "form"; @import "layout"; @import "navbar"; +@import "tree"; diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/taxon/create.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/taxon/create.yaml index 4087bef44d..5376950955 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/taxon/create.yaml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/taxon/create.yaml @@ -9,7 +9,7 @@ sylius_ui: sylius.admin.taxon.create.content.form: blocks: tree: - template: '@SyliusAdmin/Taxon/Form/_tree.html.twig' + component: 'SyliusAdmin.Taxon.TaxonTree' sections: template: '@SyliusAdmin/Taxon/Form/_sections.html.twig' sylius.admin.taxon.create.content.form.sections: diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/taxon/update.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/taxon/update.yaml index 659471074e..1b1fd87dd9 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/taxon/update.yaml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/template_events/taxon/update.yaml @@ -9,7 +9,7 @@ sylius_ui: sylius.admin.taxon.update.content.form: blocks: tree: - template: '@SyliusAdmin/Taxon/Form/_tree.html.twig' + component: 'SyliusAdmin.Taxon.TaxonTree' sections: template: '@SyliusAdmin/Taxon/Form/_sections.html.twig' sylius.admin.taxon.update.content.form.sections: diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/services/twig_component.xml b/src/Sylius/Bundle/AdminBundle/Resources/config/services/twig_component.xml index f759f23a04..9157cb6524 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/services/twig_component.xml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/services/twig_component.xml @@ -37,5 +37,11 @@ + + + + + + diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Component/taxonTree.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Component/taxonTree.html.twig new file mode 100644 index 0000000000..d0eff14ea7 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Component/taxonTree.html.twig @@ -0,0 +1,66 @@ +{% import '@SyliusAdmin/Taxon/Helper/taxonTree.html.twig' as taxonTree %} + +
      +
      +
      +
      + +
      + + {{ taxonTree.render(rootNodes) }} +
      +
      +
      + +{#{% macro render(taxons) %}#} +{# {% import '@SyliusUi/Macro/buttons.html.twig' as buttons %}#} +{# {% import _self as tree %}#} + +{#
        #} +{# {% for taxon in taxons|filter(taxon => taxon.id is not null) %}#} +{#
      • #} +{#
        #} +{#
        #} +{# #} +{#
        #} +{#
        #} +{# #} +{# {{ taxon.name }}#} +{# #} +{#
        #} +{#
        #} +{#
        #} +{#
        #} +{# #} +{#
        #} +{# #} +{# {{ 'sylius.ui.create'|trans }}#} +{# #} +{# #} +{# {{ 'sylius.ui.edit'|trans }}#} +{# #} +{# #} + +{#
        #} + +{#
        #} +{# {{ 'sylius.ui.move_up'|trans }}#} +{#
        #} +{#
        #} +{# {{ 'sylius.ui.move_down'|trans }}#} +{#
        #} + +{# #} +{# #} +{#
        #} +{#
        #} +{#
        #} +{#
        #} +{#
        #} +{# {{ tree.render(taxon.children) }}#} +{#
        • #} +{# {% endfor %}#} +{#
      #} +{#{% endmacro %}#} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/_tree.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/_tree.html.twig index c8117025c7..db9683d607 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/_tree.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Form/_tree.html.twig @@ -1,5 +1,4 @@
      -
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Helper/taxonTree.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Helper/taxonTree.html.twig new file mode 100644 index 0000000000..7fbb0f428d --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Helper/taxonTree.html.twig @@ -0,0 +1,80 @@ +{% macro tree_dropdown() %} +
      + + +
      +{% endmacro %} + +{% macro tree_header(title) %} + {% import _self as _ %} + +
      +
      +
      + + + + + + + + + + + + + {{ title }} +
      +
      {{ _.tree_dropdown() }}
      +
      +
      +{% endmacro %} + +{% macro tree_link(title, url) %} + {% import _self as _ %} + +
      + + + + + + + + {{ title }} + +
      {{ _.tree_dropdown() }}
      +
      +{% endmacro %} + +{% macro render(taxons, nested = false) %} + {% import '@SyliusAdmin/Taxon/Helper/taxonTree.html.twig' as _self %} + +
        + {% for taxon in taxons|filter(taxon => taxon.id is not null) %} + {% if taxon.children is not empty %} +
      • + {{ _self.tree_header(taxon.name) }} + {{ _self.render(taxon.children, true) }} +
        • + {% else %} +
      • + {{ _self.tree_link(taxon.name, path('sylius_admin_taxon_update', { id: taxon.id })) }} +
        • + {% endif %} + {% endfor %} +
      +{% endmacro %} diff --git a/src/Sylius/Bundle/AdminBundle/TwigComponent/Taxon/TaxonTreeComponent.php b/src/Sylius/Bundle/AdminBundle/TwigComponent/Taxon/TaxonTreeComponent.php new file mode 100644 index 0000000000..d510b1474e --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/TwigComponent/Taxon/TaxonTreeComponent.php @@ -0,0 +1,37 @@ + $taxonRepository + */ + public function __construct (private TaxonRepositoryInterface $taxonRepository) + { + } + + /** + * @return array + */ + #[ExposeInTemplate] + public function getRootNodes(): array + { + return $this->taxonRepository->findHydratedRootNodes(); + } +} From 03efe82baa3363e4d92368c59023e91fe36c32af Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Thu, 19 Oct 2023 16:10:47 +0200 Subject: [PATCH 042/166] Make the taxon tree a live component --- composer.json | 2 + config/bundles.php | 2 + config/routes/ux_live_component.yaml | 5 ++ package.json | 3 +- .../AdminBundle/Resources/assets/bootstrap.js | 21 +++++ .../Resources/assets/controllers.json | 4 + .../Resources/assets/entrypoint.js | 3 + .../Resources/assets/images/loader.gif | Bin 0 -> 20218 bytes .../Resources/assets/styles/_tree.scss | 12 +++ .../app/template_events/taxon/create.yaml | 2 +- .../app/template_events/taxon/update.yaml | 2 +- .../Resources/config/routing/ajax/taxon.yml | 29 ------- .../Resources/config/routing/taxon.yml | 6 +- .../config/services/twig_component.xml | 12 ++- .../Crud/Update/Content/_form.html.twig | 53 ++++++------ .../views/Taxon/Component/taxonTree.html.twig | 8 +- .../views/Taxon/{ => Create}/_form.html.twig | 0 .../views/Taxon/Helper/taxonTree.html.twig | 80 ++++++++++++++---- .../views/Taxon/Update/_form.html.twig | 10 +++ .../Taxon/TaxonTreeComponent.php | 41 ++++++++- src/Sylius/Bundle/AdminBundle/composer.json | 2 + src/Sylius/Bundle/AdminBundle/index.js | 3 +- src/Sylius/Bundle/AdminBundle/package.json | 2 + .../AdminBundle/test/config/bundles.php | 2 + .../test/config/routes/ux_live_component.yaml | 5 ++ .../Controller/TaxonPositionController.php | 70 --------------- .../Resources/config/services.xml | 5 -- symfony.lock | 21 +++++ 28 files changed, 245 insertions(+), 160 deletions(-) create mode 100644 config/routes/ux_live_component.yaml create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/assets/bootstrap.js create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/assets/controllers.json create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/assets/images/loader.gif rename src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/{ => Create}/_form.html.twig (100%) create mode 100644 src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Update/_form.html.twig create mode 100644 src/Sylius/Bundle/AdminBundle/test/config/routes/ux_live_component.yaml delete mode 100644 src/Sylius/Bundle/TaxonomyBundle/Controller/TaxonPositionController.php diff --git a/composer.json b/composer.json index f53656b53e..54d7b01ab2 100644 --- a/composer.json +++ b/composer.json @@ -126,11 +126,13 @@ "symfony/security-http": "^6.3.4", "symfony/serializer": "^6.3.4", "symfony/service-contracts": "^2.5 || ^3.0", + "symfony/stimulus-bundle": "^2.12", "symfony/string": "^6.3.2", "symfony/templating": "^6.3.0", "symfony/translation": "^6.3.3", "symfony/translation-contracts": "^2.5.2", "symfony/twig-bundle": "^6.3.0", + "symfony/ux-live-component": "^2.12", "symfony/ux-twig-component": "^2.11.2", "symfony/validator": "^6.3.4", "symfony/webpack-encore-bundle": "^1.17.1", diff --git a/config/bundles.php b/config/bundles.php index 359bcb430d..faf7b16f02 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -60,4 +60,6 @@ return [ SyliusLabs\Polyfill\Symfony\Security\Bundle\SyliusLabsPolyfillSymfonySecurityBundle::class => ['all' => true], Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true], Symfony\UX\TwigComponent\TwigComponentBundle::class => ['all' => true], + Symfony\UX\StimulusBundle\StimulusBundle::class => ['all' => true], + Symfony\UX\LiveComponent\LiveComponentBundle::class => ['all' => true], ]; diff --git a/config/routes/ux_live_component.yaml b/config/routes/ux_live_component.yaml new file mode 100644 index 0000000000..e56523abfb --- /dev/null +++ b/config/routes/ux_live_component.yaml @@ -0,0 +1,5 @@ +live_component: + resource: '@LiveComponentBundle/config/routes.php' + prefix: '/_components' + # adjust prefix to add localization to your components + #prefix: '/{_locale}/_components' diff --git a/package.json b/package.json index 9257dcf4fd..0411084551 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,8 @@ "jquery.dirtyforms": "^2.0.0", "lightbox2": "^2.9.0", "semantic-ui-css": "^2.2.0", - "slick-carousel": "^1.8.1" + "slick-carousel": "^1.8.1", + "@symfony/ux-live-component": "file:vendor/symfony/ux-live-component/assets" }, "devDependencies": { "@babel/core": "^7.0.0", diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/bootstrap.js b/src/Sylius/Bundle/AdminBundle/Resources/assets/bootstrap.js new file mode 100644 index 0000000000..ef56aeb538 --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/bootstrap.js @@ -0,0 +1,21 @@ +/* + * This file is part of the Sylius package. + * + * (c) Sylius Sp. z o.o. + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +import {startStimulusApp} from '@symfony/stimulus-bridge'; +import LiveController from '@symfony/ux-live-component'; +import '@symfony/ux-live-component/styles/live.css'; + +// Registers Stimulus controllers from controllers.json and in the controllers/ directory +export const app = startStimulusApp(require.context( + '@symfony/stimulus-bridge/lazy-controller-loader!./controllers', + true, + /\.[jt]sx?$/ +)); + +app.register('live', LiveController); diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/controllers.json b/src/Sylius/Bundle/AdminBundle/Resources/assets/controllers.json new file mode 100644 index 0000000000..e2ce9b5cbc --- /dev/null +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/controllers.json @@ -0,0 +1,4 @@ +{ + "controllers": [], + "entrypoints": [] +} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/entrypoint.js b/src/Sylius/Bundle/AdminBundle/Resources/assets/entrypoint.js index 445e44930a..48c2985ba9 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/assets/entrypoint.js +++ b/src/Sylius/Bundle/AdminBundle/Resources/assets/entrypoint.js @@ -9,6 +9,8 @@ import './styles/main.scss'; +import './bootstrap'; + import './scripts/choices'; import './scripts/statistics_chart'; import './scripts/sticky-header'; @@ -16,6 +18,7 @@ import './scripts/tree'; import 'bootstrap'; +import './images/loader.gif'; import './images/no_data.svg'; import './images/sylius-logo.svg'; import './images/sylius-logo-dark-text.png'; diff --git a/src/Sylius/Bundle/AdminBundle/Resources/assets/images/loader.gif b/src/Sylius/Bundle/AdminBundle/Resources/assets/images/loader.gif new file mode 100644 index 0000000000000000000000000000000000000000..93763396f96f6dbff26b6eeef1fda68fdeb51dbf GIT binary patch literal 20218 zcmd74eO%M^{{R2l^(A8)12)+8-oStXV_XeH8@qgOqM?zYkxeuYna6`jW{UFOfU$Aq zhCp76NQP!7H7hIY3`9kvLbG$s{1m94GP5GHvhvvXHQ%}8>0_Pxe13oY`lJ5ncJp@Y z*8TZ--Jg%w>ph#@s?VQi00!_L0AwP$wY_!Z?Gdxlj3gpgE??QRd(VQ31p>a{+PBv> zZ{2+E!*iuGOS5&^hh9CzX0jJAS=`y(dF|@81N#r$xOwB^#}~`zlou8h)-10fQ^}nj zo#)P;E1q7gNzq*S;>w=C?h(g{Z~Snhuea~w`HQ8qO0#pbhX#k(9Cl50%}+o51pd!| zDSl#2x0K#zDk`z)(zPT4`~wx=lj#)rPfh3#5B+BX>djzh6{?9_JKR@&d~w0H(f%68 zb90_QvuF96pRfGe*xnVz>6_lUbYSIMOJ4hE;$ZFc=Rf#z$Z;{KuS}Vy;0O`6kRzC; zimRpZuxSjn2y}IG`Hnj7OfP`g zezP>8ONO2iS;f1mhz6gMlTu{Ry;a0p6Df}t6@5AwAa|iiehFhem)+GPnO(xDf5SoR z@B_a>7KrE~BEAwk;8DSJ^}ZvR_rEX)uY*i~l$;1Qpq0eE`Q#*G0wss@JwvYU*bdD6 z0lMKbuN@Tb1RJ6mc97V#!mw+9$5bVt#O<00%8iZe)O>_ELm8kvo+b_aNgKth>H0hG z(SKw}GglhTrGrnjfApI3Fc6rcm9w8FocHSQJ19S!4c?2HPZ}+X&-=@mG5-C3Fd9-p z#0~zw2NV@_R~){DTM#|KfDoA-QaG3NJH2l zc!&~#NJ9uA)u&ILhV(+DA%PHA2sR`cf<1C#1i}w-g#bfhA=R}jYa#Qk&8@|b5YLc& zI1UhX$obIGAxJ))mjw$KK*$9#g42IL4d(?C4hI1a2;}_0O9vq5aI)Yah^1mUM{r)s z=a$#5sXg?@Avkn!Onz+ys5cFp{}8b6q(0xgrGM{pQvl$IGKzJ=WHl>UsGCNP$YN1b z6w~Ee*G5-Vj)N4x$rVp>B#C>0EIDZ^2?GgP$yo_5nGlt1N~3R*p#1GGzqB#65zUBl z?J*@0Ty(ybv{5WD3i@47TXaO15?PsqP+W2Cwo#D%nT!3Q(uG)&9hXh70qJw*jMPht ze41%(fcdrK;$fG9OG7@W<}v649XujdC=P%OMw=ni+edHsoK9Kz6Y(vyLgBwhnMlk* z_h%4!0x(DY)r*+-LW?1#V}bn1O#dY0O7S@|X0Wq>x|SI2IQ_x9(e_}`3g3JL>#$bz zh_5RBE<{hLlIV;*ycm~8@F;z3Jm9sc=VAtqojl|J&4Z)`powm99 z(QDhu8gOj=LGZerrYYL8XD=QBe3D;eJm8$M!1_i~$cd5SSv4Bkt{MJ%|cm>y!Ejfb95TZ{-i!i$+v> zcCxf+!N=L0!jTJ3A+(DB})KKnFwFgP%7 zARb$B_2-<$v5l!5bI}v~$K34POFi*LcR6c+j$WK$2rz!~hZ%-(i@O7iVLXFzhGD+m z$uLA0G7M=9$1sjAOjF1+^g@P1({U?|OYN#$t7 zIn$_&JPs{URh;XUC@tD&MJSQqjPZ#MHS!{mXw;6^K$a~EquH{W)9B4ZHbI6@lF*!# ziRQeQ(PN7RX)Db{AF?lBGzbn_a!8m$yHXuR#^mQMR4m>u#Xe~`O(#^kdGi5M6W_}Q zZ4^tzW93tp}qT7+D!&} z0cqtz#N&Q6fkQe-wSv#hidxz1o+W4Ndz`v`RimHYr;g1th|#Lo{CBv*FBo1z{xx;* z+){_5Ly%wGhC?yQ55*)Ny^u1PvM_)lbRmA>S$<0qU_!&74TWW#7=|To#t=7%EgT3K z#*jV;GR$lkz%aHU$PiEH5HP$U$S}O|^o8KVpoJL>hX8^Mvp>+hOhY(W zkYY$QJRw3jDyM3Ns~xYE|yqL!eZGL zO&*qJmqnzfFw-L%r%uYuXHpro;uMTz6JvZ-64eZ%B#y{vd2^r*&3H;_*8%wnv(Trd z`-EsxmP@YorN*G~7{Q*2Z8b|=IU1uT$932uBVtHGMqwm{{8|}r9#9)Q1elfkM zK}7-6xWhZ*fF!rMtc=h<#EW0wQAjjAhLQ|9{t?n>58XyjXt|=_NwVjWFSHgO1ep0d zUMw~yNu~uUJQh}s90!$gff}GIx#0|!^B&Z8I`1=>V==PbNS=JPCmx96Jy%Nn?<7aQ zMDGlOp59dXUUZ1aUDQC(8(0f8^aiJd*R$$4L03Rd1|<7pLeWm=*eLgQhFFJP7|&$Laaf8W>u_4`g!pz88@Bvz zozU+d()OH3?7izA9f|*wuY|7+CpnnEJlEtA{3Bx4_LN2$`i_c>hTXR)bf;^|U^HbZDk^o9Eyhx`qBNrX&SM&}QsnQ9- zLgl(d-ljReGiQ!0d$a9XVCC1u|qUOfiHPVheE#X$3t0_a6vLF$`pwx_Au{O5=^8G=@m*jQ_{_SiL1 zJ&L+~apY5L6dPA%)yWRjrADKoHF7&+jm{!pqv|v&n*dSxsoeQ6V_JlRd+GEzS|91^ zxJIa2L}$>!bfB6UBm(+`S2(e5$9X?906Go)3m@{LxyuCO57U3w1!7z( z3pih(Xu0ulx~TosmZHwC<;%GVIbWWV4=Sy4Yn0FW-C@!<A{6I2?^3zz zG2>k+z7@!`D#t~?p~oSb2Sa)R(-?9Cfez_KM`uVWZj}=duW&PguXrJ`xYbWUltU(Q ztD=B3@O7t+3P04Bx zU0{zuR324ShLhk?+Z6k3LT#;gYmXy=k;|qeB^2-032n){qc@s_DNUSQgww=+%fiyW zx>|k6Ch$P4JyJ`$NB5Mepb_xK-s{@Z1S2}t!?4GA_~w`cz&VKVBDc&TE8XKqcZ-K- z*2tZeq?Z&__DPgKFv?WY*jo(eBZI9<1>szo9-*>K`R%8L!%81EW!U4_Hhek!PofEF zKGa|s@e-!w`LB?I=wTrV*nGl0K(&%iC|86LY` z$9+=Ku_GU0aK`l$zFs{%U6tj%SE6WbV#=4^QY&dGYPFJLCE1l@FKYjiF)< zH)Tj9jB1E-D4|#WGNIw(2gd;S3|uepkcROLN8-+e#yumP(Ernv{}+;Ru=eeoee4;B zomkSQxw*g{ld;;K9-HNMMuSqrBb zh^&ds7P)#|$^n}+1|WkLX)|4FZYES>eMNa|h{lsEE@DJN5g){5$}d?uBHd-&@v6@^ z^J07Sf@B5V)~1XurSD(R;OZgUm(b&i7Epk|aWPHZ%O~E2_fkC`SM{^ zK?%)U$`wTWrg5h?9`xs#dU;*iZ$AaJ9x}fJ%;cVwqiG#NM_VbWYMg#{w~3AIpYhK7 zChl9Fz0)=!#&gPid3mb*rG^Ubm1ZYdYr4Rte%adFw{a*D+hZCfmT-Fw-eUI>@ltGl zpcN1nU_^{m^Uk&com#rFFSvM`{IYV_`1@y@*IAjJ<|%z12k7rypjWiKM|jgQ2VEaw zG`1kpIi&S_OPWY=kp%PN^X>sat=MpIc%FRC?va0#+}LS*=IA-Qyb#P0=MPn3Y#M^a zOJHYl+m~^m`^P&RABI-ZHHQxB%Q6$5>g+xOohJfP=9rEW}buUa#7}}wo zEky(6113CV8PbX`guj3q;taDIQV%m6W;GlF2y#fvbF*=r!>$gK`4?`1Bm5hGhuh%# z->uLG%f%hVi5;Vd&=rK6SO$5OmPE(AfKFPL*aVUh27?w~mzp?_ETXbA)b(~*U5d~w zOsSJO$m$F>RkXdB$&vVgD$T~N6YR7k3F^2urs|+1g*lbijU~KX7tOO0>g1@rj$l

      jKQ zUKAkJ?-ILLAnzT27x_j(8uIg09IZ}*OzFD*HF*E~+I=B>naQHr8gjQVAO1FYkj=XT` z7y`WJH$0Lbo>|PJWj$4{pr`%>qRn}$NDGVBirlvUMbwrd{ zN3gMDnt@F7Q*%d-stx@7yrF=HUUE>{?DEIJ~Kvpc{XaGvUoz_h{u9Z);Sbq>K&`am~N zye3yZ@Kwc`h)R>=`u9D);nwbqk?0xNGU`p98*q?EGZ!m(GeGu|8>$2J=6jN)edi~f z@jzffZVWV&kIJ@~_2ocLlJS}{MymB-*vg`L*AI$&zgg5lfB4>;^8(~pu-7z;Jh9`F z3A~Vxs{2tbLTA|#2Q}YVR1>aa`Wn;|?4aI)cegeE6F)I8s5*D$?9`{$Ify`x}?cS`VV zlPo6%p(AlQ_iW1z(!5E*+@@3^IexgJK8XUjY9lbXwu{)Vr6oaPygPbJDZrL~IT|Sh zrGk|Pu-+3@&ykZ2=Pf(pCoj5ou%}XjQM?Pm*Cm&PfF+@=9wlgw_KNsaA~%zGlD^LC zC00865$aPO>5bm)YWFD@!Oi^dlG7zbr)EeBK9&a<&YOAMEtEu+tw|i`YSbS9n_8uj z(raZ5qG~%Ms6(0wBURfYM&t+7r%4yzGNozix)xVjW}BxxA=U-ID53QOOKtS{`cc+G z9iIWf_VVpA_Uz%EZP899jl(~Xi;&JVm`Io}`#{V?%IAUSJ_iRJn-KjCh`(fOih9{c zbN+kB=RLO!8lL}386x6w}dDZ*Sd$#-UGonp$q ze;kj@y2v$gSZ8*6XD$BbTQ@BzH{7RD^*`mOrdM)#bcrC#nD_9!QB$V-kl$eWaIZF^ z_2tP2Dc|@QgG(rfQCmC&Ltem z@K%5?yKo$TF^hksw3#^g;(Puinw|xm0})qDX$h+u8WPf$r|B9}v$I7FeD6}lDsr8P zl)FmdNLQpNQ+VmlXf06FtTZ*?M%$t(jh>vjd8_i!SHNo)T2zCU%x%a@dZ-?}Y|B}d zU`g|XESWbVV-OG}<;-1y@ds|$F0(%qV)?{1{G+k zu_>>7k6k>xm2RGHnChMvX;ex0^8QBo(LyEX+dbFSeMg!nbG)r*)+v2P5bw_}D{bMv zs){D`S0?tkZZuC$Y2HKj2NN8~0U(#Z7qqY+C|JAs%#iI^OKd^^*-LqSgVI_w=sKt$ zQULzbUh)TDk9k}EoO4p@A`cwq(Y__i1ACKp@(!I_K*e6AS?K#s#oks+-yr)X+hu}3 za53oxL}D!*+dB}y@C`s;@4bHj++V#UKfylwz*NejRjs@e11}7FCTDi^oyn@0N{acG z=^8ES7|sHej*>Hn-}@$lDXcu_+;b7RXZBwchdxbkEoQxG8DD>H9pT+}9`V}|_1i~D z1Y^vs5{gsx+~%mUMJLKA=rBEosPU6nAAj?wf8AvM+liz5JtgGNN6l@Xaf5;w;|3Kv z3YfQU=5IBSKc6$Vkq#XKw+|VJH#{yN)&Ju8)~yh3Q1EENdB!CQKWE^v1F61KqVRJj zj5HjO@F5f47~meT?f35iwVb+Ly65{ppHSBciE;qsO7@eE7y?ocq7*Una;0ruK$>gU z(7Wr^lOB$YtCw>W3XU7Zt+uk;@)8M&v3)%crPZ@i%pz8Onw6%lS9qsH7H$nZnB*pp zm}AHdNtTHEOdFwIT%KH?fC}o9%^7Nd$ZQ#TAg`QS|C}|lp89%yq5Ty=bIcvBG5{(e zQqUf~y}@WNpqZ`gK|eAer`StxT+Sx#2s|kl@Sg+(L!^?~oG`9c)A*tx`lpwAOwnwH zRYP=Q7o%@tiOy|&$oG@+6W#MCHmz=I?F5!}uqz(osDNegOCLyTi&<3Dt1YG-Z8@JF~Vr*`375Ps`W3fPP+~RFllqNSn||w;<6%McmSdNrF}&AfW|7 z9%o~@`E&DHGB&vLtndI%wr3ucl#}YSU%e+TyZ%M9&dsnZ-0z}W^jWzAefrzB!hJwy zl|9pEJPXuztvkg|eR+R;zO9hn>l%s!512Ic-F|YDoQ9T`3$s;2 zBn57{9=Sy4DLx~wq|8*#vP&ObN(8<($=X^ncV<^xQSPim(PsI3Jeu2qJSrdlE7t|+ z(oFAOFJs~UnPq6Nk=u$0$ky_nu$9xWE18@2=YbUZ~>` zL!Ah319x2o!Vw)(h_j&^{9izfM|4POVs1SQxb?O*yb8b*;ZEhiBRX8P6w8!6jI>mV zMcQPTt|}d4+IMo>i#by`Gh$@27)KW1VUMS` zV05-Urr;y2;B`w9mSa!Ea#4*dFGrC>c4gZ*CxJF`rc>);1li@5j_roBAMLlW-Z35Q1hMwF+KkrpFdERp(j4- zouTxc?6Q@&&V5#Cq(@f~_6#4Q*sfdTWwL#W!(t#}zrJGlt9Y(g{6S|;k3wEZCuBEJ zJ*>zp6GabBJvio~T@;=FH|1CuDk2$p5jp%HO7=Sgdgsr#M!yVbsJplHBfRPUMnJXcsgB{YFTV*5^8whO}?Ee_hVX1}z{revV>Q@f(_mDLk4wW^-8WJ#LR!z<) zW4WpD)dsa%l2uo*(ioLmmnvDxsAFz2r>y~bOFQT}wwMf%IxQiRCQXV>P#%^{Bhg;1n>4kMC6%&HqB$~{;%j6*mXyyk z(k)7QU6(bD&6NEpdSSZaTXP-aC)N8H9aSIGWx zw53Z#7^-^GOnDIz-Yk~)D&9S$NYfI~vOW`emWvxKdFFCt8zR107*`!(u&bg7X7tqH z5GQVuwCaA{)xip-g!@p>2d1YA5y{!;|2oAs)T<`l+^g;dK}JHWplYe}!mJbpCvKv4 za>GzM!nx_cq$Cb*i)E&$u^;D^!Dh-KDVlzwr8V&O;?|s*hreU^75DD#d+TWmRkCO9 zCBs(-(T9mjZ!yMkkGzja5OCH|f0SzAfB4#?^Cqc$SCJuh4lnw|zR0bH| z&_r;up>)8ohDnVtia6GgX&BZJ=y1&rn|uf~Olla@a7)A+Nf^zLcqr)5IH0MAeHyP~ z{@7cqjqdHkfxd1^@R>iOPna^(Ya46nDXyr-1Wtw|q0zUL(f}BGQyi}eD`pc}MBT%Z zTD2{sHf^dl(gOqg=TBg$StyegCA z35O46rk%@I*ai7<>XcmXSS5X|k$1l%lJg2k7kc|qHt5+tKHQ8_ zect}2i?FIhwO6#C4w`2ruJIECoNyBuiEg)3B~hV^(*DCw$S4Sm>=rT_ei$3JuEy_SyE{wQ_%`~u3PUB zM(ET(9*!_#fp;H!`nB0X+92yKTv_pLfr8B5PEY6x|RQWX@$4zc*_xP z*CD*2{^a)EC)^G3a1P&n!co9M#;-r&NQE;w+$KVbfA<5G(AP0d`(x@U&rUCu$bl;( zQB)f%cllgg%5lL3+sXM&_rtIm}yuw>=Awmp#IBG{#_eO4lnUx6=O z-$O-GW)eMF+GvY+r6Vq0r7J*nl_UAwOAiJ(ge3_?p5ei525H9udg(52KHzoq&<|{< zvplXvg)2%_CkZXaGI@})3~k~8&FRx$Wg<5_0>Ht4rD2-qC5~=7**LG^=qVM0_@ds; z#f*qr!rYMgc_UNBTBy`pki*$P{p}C}x&Eu_{Fo$D``m|IzRM|}_gTwugIP7lT!m$g zHY4Zy0}}p{@&MEIVcd3Z{~%BFC;RLA%?*}JKu$y+{5w0?wlQ*V@{AvV&lQt)-%7vc z+540a`YI|VR|%kDOD17;S%sYR=fv#@b?QRI&_h6}n@L|^!aR|k9e^yaNMi9^)kEJG zoBmw<49Ffnu8sOfV?=y<`QeW<-lnqp__MhM&onR$QTLDXWLbMKB2%n6dhG7uOnT`* zG#-OP_$w7$s>2N)WC?d^+^g?Y4%|1w@r>_;_(BN10$1xhtpisM7|(Yq2fh$O!teAA zd>ahMGt6T+GWa$KlN&~L81Fx%96x{a#c%F8nBb@o7iQ#Vki^q9Y&mFa*G0@N5XQE* z<>VGj&60K}wYFtPmy4O*&xpKe0l$qZ(M;A%ifJQmoRim@ZOL|WTtcey z@JR+wIlWMK3JbWAZ{+>T-t99Q5Ov%Ub+z*!uCmGcGhAxW8lbezMHna1diX6uy7D;P zdBIO*D$Y&%^b7KjsN#FzM6dP+n5ut*8zw$CXi!Mv8V&sIGnxw979a}6#PGrDPtNU9 z8MmM8Uv{{8J*ZN41VnT&YT!p3STE;o$X5~TpW`=1`UI4!`CI)n+e-E={_N*J<4sX38ytBXy>GQ28gfOIk zeuH(pzzZ4l|LE{SIN$E@etwMgn*|d?(qIk zIGf(|59e^6h=lb-qbE17CN|y!)D4Z{aQi2cPpki=Y|K^<0Y=Lqvy|HrFgKJVv9q#QF7O_mp@>r^M_=vP_L0K% zaEyq1uTPG)EpC8U{CTlUDl%%@>9M$7mc08rvjQ**K7yM_r zh3wJHU}Fl%eM9X0`(nx$N@SBrr+xX&mY62ijLMTA4mS}GM+E%#kAv9f_tt6+EX4t> zarFx1SFS)GA^t|?5&qT&QiF3H_GcK)kSQ3`5bdye;H4cbmthu%M5H3iurZ*PuGNl$arrQzC&=K)Qd+LAN zX^p3hqQ*GCC4L(3rr2Jx0?@s#2R`<~Yv>iKa;IU;3NPO|1@Z)-M9?(M9;Q>gEZ>kxm{HUCnNUw`o(V*S@2eTRkm&a8&R0O1bX2OiYnYnD4x z8nPY^YN*wJY%RR?xw)Bi8L9_+dKyckVM*t6BITg9O_J^4@N(Kf4v*uEj_XQlY0XMN z^;unAS^BwBek)nLfip?aN^G(ukXw^vlP1ZMo{N5HQfumoKFYRfER2@@#X01}C$K_@Hfw0K8<% z4u*NNOCDPlcu~nQuiq_DZRItx*Xqe&sh0?nI?F&$5M@53)#-=1E;&X*#Usx?vDW)7 z!+NrH)VZJ+C0PZ4H&EmbaF7!RB$*TE9}KWs7t8kzTr%<&%S*)@g76!-ijUk(`%724 z^H`3r_cUN@kClLH{*p~Xe>8Yt!<^xYPSUua+lqDybQLieunZGXKRFZZv!!f)?BcGI zt*@HqR3bOVTso^#%?Y$BeNzCd1NotJSN*Z-Z*xC9l-5Vy!6_v4Z+SJzv+baR+6O$k zBN*}m7yII&=*_~ociUP^d**mai@<@wr6o*5`w^9X^=Drsk`k;rvkv|A+O&4U#7=>H zTh`z;CLvwpIfmWsjV$#)SjVm2?#_UQIN|9Gl>;IT0~#keT-xCeQ^L6nO#?O*IL4uX zhL2S4_s(lkv(nl!f}1+v_}R?KpcqSmgBA~|)j-AQfjnF2JgJDuL0H#e8pPL5A0NYQrz zqR&F|#~5S8Yd4hZ+mm$`R!%$BB1GEbt?}(qFVDffnG2FF(snWW29Tn;QW}%YOw6B} z(yp=7+K-sh+F!F}x2N40*5vd35k877u47LXxgI5f^v=zToa7@uTc#PlL3MeG8knL2 zGG_3xz}MdXo^L9)aac;jJUu@$Ve%^TRd|8dC;JGiGiU2B8>V?9V%lfPi#*fdj~SSQ z1nv_JoAZ@#O%Ljn7dnZ^;H!3JwdVc(3qh4(nYp*pS7k3A%XYgUzqhAV8>Av`9a@I}c5tBKqTTX{3rayPH++>H|bs8P=^UKa@NdN9B?Jmzbdx4&Jj z^f4-S@+Z^g)?AOOEFqb^9YbXQn784~(&_`sw;uEC;8kBPVuKyz*2r@^-=5*RcCF-Z ze_6bsYRRJ>!o*VT#nB1Z0Jyf|{4akv0Z_fRyF9A;x9@lHLN4qS5Lp<1kkruY)ZhKl z7=#sq3*{orD})uY2w{a<5q1iw;4sahN}k3?iG&bPz+x5}lcn5VATxn%|v4@6Ml_r);Mr zBu^4%bpiOZ9z=iW%P)v*R=XzC!rTmQAuF&7AhK3rLS#+`B~l=q3jKm?Q)K{+Mbw@R z;T74my6&|RYI|~fI*zXR^MZ=QGgvC^NMroo?T3@d41ammkm5Mgru7zr3FGlyw4;mk zrxcE1Z$vv9)aiHz3ld9MAl}b&@t6JRC71o_qURGvvkiVn_GF(7t1}Xb!pc55R&Qp4 z{(Yy;FhGc4JXp!HjEaPaP}*iQ93=kQwS1B@P123DwQHhK zZFdU2TRSx&GBYAGGNCvll)C#8a()h7sZk0EwnYn{>89)6Ky%vFX%@z2K(jgdDv2e21RGLmKN5)u^X9(3>U;55@w&qSAEFcI>xoOYBFevu zA5rapYew5&+Rd$-#!!;U_C(9b?#Ed+%0umB`9CSgk7`$gcHXWAkP={Ay`*^56=GOZ z7!_hzXWP}gOK-L)PI-VhmkZIETOe6_gRvUa(ovF&@YKzeqrQ7lEc1>S8ezL2V)lU4C(#QkqtfEjGF8)buyku{kJq8uAz{e2Q;6Mbm6$!3 z-%b_Z;SD0AD0A%wYiiQkL}KFFtUSBEJ#Dv{)dwLK{vC*|;{Kzil*7ssM)m=~`J3%P zsDeueX_hJaW>=pGi?qzuzZ#tGZ5Fhbh-ZweEqr48A;!FM_0~XqdzoP0a$^TibW;fiZhnJnN37jgGek4U?xFug{GzaeJMO2nS1aGA5D)Vn|Ec)Hh`e?*-=;s6 zuRB@NM7Nc;=_&A_NuT>hjg$K^ihVTSzyDL`$0J??Nc@&}TzmNB3o6~5&Vu_RpW@A0 z%RRJG@EICmqZ{}11bgc50Z6x|_n(!6laYMSY~5F{ro1(0?abP_y-k39&r4nOitRye zZ-TG{eWBE4ouBVE)_DCF^0)r$7nc5o?yX<`nEo65;!Ol@4Ul3e4v<+Ww-8>ulEBj! z=NHxxkY5YnmtI5=5q;B=Vcpi%9S7w> z(A_N{I8d8d#u#1G(tL(F6DN`*>k&6wHD?cNOEjK7j)q+!Q1(=A)O^Uuj?OHDgZ@ebYBdZ zB{)uVo(n7jQv{+J$B*!0yXK1RGZ>bR#b7jI-VFO$o~WygJHv2X#c$?fUp?EY@HID^ z`Ji(9#aS1KN_u4?W5y|zvK?JQ+^aW#LQJ4P#PpRgOdag5>B4ckA>}29ve8d=o}xQI zN|T@a)DZcMipYp#KjWvHnyhjMLj21>rb@fyh{2dKZ)ewMXL(OPaQx^YN5U8LDB24j zQs#nEInO#$*3LSS65+R#Hy&J_-#_~UW@M0cdRH>hTNF3ZJY78ZEzW}t-A_|q*8F$D zOvUvpyf;A=_S|DLGm1CPc_M`{(HESnV& + - + + diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Update/Content/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Update/Content/_form.html.twig index 224cc46119..29153c38d7 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Update/Content/_form.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Crud/Update/Content/_form.html.twig @@ -15,32 +15,37 @@

      - {% if _context.render_rest %} -
      -
      - {% endif %} - {{ form_start(form, {'action': path(route.name|default(configuration.getRouteName('create')), route.parameters|default({})), 'attr': {'class': 'ui loadable form', 'novalidate': 'novalidate', 'id': form.vars.id}}) }} - {{ twig_event( - [main_event, fallback_event], - _context|merge({ - main_event: main_event, - fallback_event: fallback_event, - form: form - }) - ) }} - {{ form_end(form, {'render_rest': _context.render_rest}) }} - {% if _context.render_rest %} -
      -
      -
      -
      -
      - {{ _button.cancel({ text: 'sylius.ui.cancel'|trans, url: index_url, class: 'btn btn-ghost-secondary' }) }} - {{ _button.primary({ text: 'sylius.ui.update'|trans, type: 'submit', form: form.vars.id }) }} + {% block content %} + {% if _context.render_rest %} +
      +
      + {% endif %} + {{ form_start(form, {'action': path(configuration.vars.route.name|default(configuration.getRouteName('update')), configuration.vars.route.parameters|default({ 'id': resource.id })), 'attr': {'class': 'ui loadable form', 'novalidate': 'novalidate', 'id': form.vars.id}}) }} + {% block form_content %} + + {{ twig_event( + [main_event, fallback_event], + _context|merge({ + main_event: main_event, + fallback_event: fallback_event, + form: form + }) + ) }} + {% endblock %} + {{ form_end(form, {'render_rest': _context.render_rest}) }} + {% if _context.render_rest %} +
      +
      +
      +
      +
      + {{ _button.cancel({ text: 'sylius.ui.cancel'|trans, url: index_url, class: 'btn btn-ghost-secondary' }) }} + {{ _button.primary({ text: 'sylius.ui.update'|trans, type: 'submit', form: form.vars.id }) }} +
      -
      - {% endif %} + {% endif %} + {% endblock %}
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Component/taxonTree.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Component/taxonTree.html.twig index d0eff14ea7..262672e3b5 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Component/taxonTree.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Component/taxonTree.html.twig @@ -1,13 +1,15 @@ {% import '@SyliusAdmin/Taxon/Helper/taxonTree.html.twig' as taxonTree %} -
      +
      -
      +
      - {{ taxonTree.render(rootNodes) }} +
      + {{ taxonTree.render(rootNodes) }} +
      diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Create/_form.html.twig similarity index 100% rename from src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/_form.html.twig rename to src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Create/_form.html.twig diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Helper/taxonTree.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Helper/taxonTree.html.twig index 7fbb0f428d..fb5a4bc629 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Helper/taxonTree.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/Helper/taxonTree.html.twig @@ -1,4 +1,4 @@ -{% macro tree_dropdown() %} +{% macro tree_dropdown(taxonId) %}
      {% endmacro %} -{% macro tree_header(title) %} +{% macro tree_header(taxon) %} {% import _self as _ %} -
      +
      @@ -36,14 +74,14 @@ - {{ title }} + {{ taxon.name }}
      -
      {{ _.tree_dropdown() }}
      +
      {{ _.tree_dropdown(taxon.id) }}
      {% endmacro %} -{% macro tree_link(title, url) %} +{% macro tree_link(taxon, url) %} {% import _self as _ %}
      @@ -54,9 +92,9 @@ - {{ title }} + {{ taxon.name }} -
      {{ _.tree_dropdown() }}
      +
      {{ _.tree_dropdown(taxon.id) }}
      {% endmacro %} @@ -64,15 +102,23 @@ {% import '@SyliusAdmin/Taxon/Helper/taxonTree.html.twig' as _self %}