From 88950fbabc7b7e1b097d06b9d74035cb347b9869 Mon Sep 17 00:00:00 2001
From: Martin Grossmann <martin@vyvoj.net>
Date: Mon, 15 Jul 2024 18:38:23 +0200
Subject: [PATCH 01/32] Go to frontend list in admin is now usable for large
 number of domains

---
 assets/styles/admin/todo.less                 | 20 +++++++++++++++++++
 .../views/Admin/Inline/Menu/menu.html.twig    |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/assets/styles/admin/todo.less b/assets/styles/admin/todo.less
index 2eaac65c8e..f2fa422c0c 100644
--- a/assets/styles/admin/todo.less
+++ b/assets/styles/admin/todo.less
@@ -30,6 +30,26 @@
   float: right;
 }
 
+.multi-column-list {
+    .form-choice {
+        padding: 10px 10px 10px 18px;
+    }
+
+    display: grid;
+    grid-template-columns: repeat(5, 1fr);
+    grid-gap: 0;
+    background-color: white;
+    padding: 0;
+}
+
+.multi-column-list .box-dropdown__options__item {
+    &:first-child {
+        border-top: 1px solid @bg-page;
+    }
+    box-sizing: border-box;
+    break-inside: avoid;
+}
+
 .table-form-cell-short {
   width: 335px;
 }
diff --git a/src/Resources/views/Admin/Inline/Menu/menu.html.twig b/src/Resources/views/Admin/Inline/Menu/menu.html.twig
index effc792252..465f892577 100644
--- a/src/Resources/views/Admin/Inline/Menu/menu.html.twig
+++ b/src/Resources/views/Admin/Inline/Menu/menu.html.twig
@@ -12,7 +12,7 @@
                 <i class="box-dropdown__select__arrow box-dropdown__select__arrow--up"></i>
                 <i class="box-dropdown__select__arrow box-dropdown__select__arrow--down"></i>
             </div>
-            <ul class="js-toggle-menu-submenu box-dropdown__options">
+            <ul class="js-toggle-menu-submenu box-dropdown__options multi-column-list">
                 {% for domainConfig in domainConfigs %}
                     <li class="box-dropdown__options__item">
                         <a href="{{ domainConfig.url }}" target="_blank" class="box-dropdown__options__item__link" title="{{ domainConfig.name }}">{{ domainConfig.url }}</a>

From 4fb43059d8d5a970583267bbde3a4e5e1ccf62b1 Mon Sep 17 00:00:00 2001
From: Martin Grossmann <martin@vyvoj.net>
Date: Mon, 15 Jul 2024 18:39:33 +0200
Subject: [PATCH 02/32] admin now can select only interested domains

---
 assets/styles/admin/todo.less                 |  4 ++
 .../Admin/SelectAdminDomainsController.php    | 70 +++++++++++++++++++
 .../Administrator/AdminDomainsFormType.php    | 63 +++++++++++++++++
 src/Migrations/Version20240813183535.php      | 34 +++++++++
 src/Model/Administrator/Administrator.php     | 16 +++++
 src/Model/Administrator/AdministratorData.php |  6 ++
 .../AdministratorDataFactory.php              | 17 ++++-
 src/Resources/translations/messages.cs.po     | 10 ++-
 src/Resources/translations/messages.en.po     | 10 ++-
 .../Admin/Form/adminDomainsForm.html.twig     | 10 +++
 .../views/Admin/Inline/Menu/menu.html.twig    | 44 +++++++++---
 11 files changed, 272 insertions(+), 12 deletions(-)
 create mode 100644 src/Controller/Admin/SelectAdminDomainsController.php
 create mode 100644 src/Form/Admin/Administrator/AdminDomainsFormType.php
 create mode 100644 src/Migrations/Version20240813183535.php
 create mode 100644 src/Resources/views/Admin/Form/adminDomainsForm.html.twig

diff --git a/assets/styles/admin/todo.less b/assets/styles/admin/todo.less
index f2fa422c0c..e014fbd414 100644
--- a/assets/styles/admin/todo.less
+++ b/assets/styles/admin/todo.less
@@ -50,6 +50,10 @@
     break-inside: avoid;
 }
 
+ .box-dropdown__options__item label {
+     color: @color-base;
+ }
+
 .table-form-cell-short {
   width: 335px;
 }
diff --git a/src/Controller/Admin/SelectAdminDomainsController.php b/src/Controller/Admin/SelectAdminDomainsController.php
new file mode 100644
index 0000000000..97024dfe22
--- /dev/null
+++ b/src/Controller/Admin/SelectAdminDomainsController.php
@@ -0,0 +1,70 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shopsys\FrameworkBundle\Controller\Admin;
+
+use Shopsys\FrameworkBundle\Form\Admin\Administrator\AdminDomainsFormType;
+use Shopsys\FrameworkBundle\Model\Administrator\AdministratorDataFactoryInterface;
+use Shopsys\FrameworkBundle\Model\Administrator\AdministratorFacade;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Annotation\Route;
+
+class SelectAdminDomainsController extends AdminBaseController
+{
+    /**
+     * @param \Shopsys\FrameworkBundle\Model\Administrator\AdministratorDataFactoryInterface $administratorDataFactory
+     * @param \Shopsys\FrameworkBundle\Model\Administrator\AdministratorFacade $administratorFacade
+     */
+    public function __construct(
+        protected readonly AdministratorDataFactoryInterface $administratorDataFactory,
+        protected readonly AdministratorFacade $administratorFacade,
+    ) {
+    }
+
+    /**
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function renderFormAction(): Response
+    {
+        $administrator = $this->getCurrentAdministrator();
+
+        $form = $this->createForm(AdminDomainsFormType::class, $administrator->getDisplayOnlyDomainIds());
+
+        return $this->renderForm('@ShopsysFramework/Admin/Form/adminDomainsForm.html.twig', [
+            'form' => $form,
+        ]);
+    }
+
+    /**
+     * @param \Symfony\Component\HttpFoundation\Request $request
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    #[Route('/admin/domains/filter', name: 'admin_domains_filter', methods: ['POST'])]
+    public function filterDomainsAction(Request $request): Response
+    {
+        $form = $this->createForm(AdminDomainsFormType::class);
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $data = $form->getData();
+
+            if (count($data) === 0) {
+                $this->addErrorFlash(t('Please select at least one domain.'));
+            } else {
+                $administrator = $this->getCurrentAdministrator();
+                $administratorData = $this->administratorDataFactory->createFromAdministrator($administrator);
+                $administratorData->displayOnlyDomainIds = $data;
+                $this->administratorFacade->edit($administrator->getId(), $administratorData);
+            }
+
+            $referer = $request->headers->get('referer');
+
+            return $referer !== null ? $this->redirect($referer) : $this->redirectToRoute('admin_default_dashboard');
+        }
+
+        return $this->redirectToRoute('admin_default_dashboard');
+    }
+}
diff --git a/src/Form/Admin/Administrator/AdminDomainsFormType.php b/src/Form/Admin/Administrator/AdminDomainsFormType.php
new file mode 100644
index 0000000000..c5907ab4c0
--- /dev/null
+++ b/src/Form/Admin/Administrator/AdminDomainsFormType.php
@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shopsys\FrameworkBundle\Form\Admin\Administrator;
+
+use Override;
+use Shopsys\FrameworkBundle\Component\Domain\Domain;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\CallbackTransformer;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class AdminDomainsFormType extends AbstractType
+{
+    /**
+     * @param \Shopsys\FrameworkBundle\Component\Domain\Domain $domain
+     */
+    public function __construct(
+        protected readonly Domain $domain,
+    ) {
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    #[Override]
+    public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
+        $domainsGroup = $builder->create('domains', FormType::class, [
+            'label' => false,
+            'inherit_data' => true,
+        ]);
+
+        foreach ($this->domain->getAll() as $domainConfig) {
+            $domainsGroup->add((string)$domainConfig->getId(), CheckboxType::class, [
+                'label' => $domainConfig->getName(),
+                'required' => false,
+            ]);
+        }
+
+        $builder
+            ->add($domainsGroup)
+            ->add('apply', SubmitType::class, [
+                'label' => t('Apply'),
+            ]);
+
+        $builder->addModelTransformer(new CallbackTransformer(
+            function ($data) {
+                if ($data === null) {
+                    $data = [];
+                }
+
+                return array_fill_keys($data, true);
+            },
+            function ($data) {
+                return array_keys(array_filter($data));
+            },
+        ));
+    }
+}
diff --git a/src/Migrations/Version20240813183535.php b/src/Migrations/Version20240813183535.php
new file mode 100644
index 0000000000..49baca461c
--- /dev/null
+++ b/src/Migrations/Version20240813183535.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shopsys\FrameworkBundle\Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Shopsys\MigrationBundle\Component\Doctrine\Migrations\AbstractMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+
+class Version20240813183535 extends AbstractMigration implements ContainerAwareInterface
+{
+    use MultidomainMigrationTrait;
+
+    /**
+     * @param \Doctrine\DBAL\Schema\Schema $schema
+     */
+    public function up(Schema $schema): void
+    {
+        $allDomainIds = implode(',', $this->getAllDomainIds());
+
+        $this->sql('ALTER TABLE administrators ADD display_only_domain_ids TEXT DEFAULT \'' . $allDomainIds . '\' NOT NULL');
+        $this->sql('COMMENT ON COLUMN administrators.display_only_domain_ids IS \'(DC2Type:simple_array)\'');
+
+        $this->sql('ALTER TABLE administrators ALTER display_only_domain_ids DROP DEFAULT');
+    }
+
+    /**
+     * @param \Doctrine\DBAL\Schema\Schema $schema
+     */
+    public function down(Schema $schema): void
+    {
+    }
+}
diff --git a/src/Model/Administrator/Administrator.php b/src/Model/Administrator/Administrator.php
index a431c7a82c..b160d8101a 100644
--- a/src/Model/Administrator/Administrator.php
+++ b/src/Model/Administrator/Administrator.php
@@ -162,6 +162,12 @@ class Administrator implements UserInterface, UniqueLoginInterface, TimelimitLog
      */
     protected $roleGroup;
 
+    /**
+     * @var int[]
+     * @ORM\Column(type="simple_array", nullable=false)
+     */
+    protected $displayOnlyDomainIds;
+
     /**
      * @param \Shopsys\FrameworkBundle\Model\Administrator\AdministratorData $administratorData
      */
@@ -175,6 +181,7 @@ public function __construct(AdministratorData $administratorData)
         $this->roles = new ArrayCollection();
         $this->transferIssuesLastSeenDateTime = $administratorData->transferIssuesLastSeenDateTime;
         $this->uuid = Uuid::uuid4()->toString();
+        $this->displayOnlyDomainIds = [];
         $this->setData($administratorData);
     }
 
@@ -195,6 +202,7 @@ protected function setData(AdministratorData $administratorData): void
         $this->realName = $administratorData->realName;
         $this->username = $administratorData->username;
         $this->roleGroup = $administratorData->roleGroup;
+        $this->displayOnlyDomainIds = $administratorData->displayOnlyDomainIds;
     }
 
     /**
@@ -626,4 +634,12 @@ public function getRoleGroup()
     {
         return $this->roleGroup;
     }
+
+    /**
+     * @return int[]
+     */
+    public function getDisplayOnlyDomainIds()
+    {
+        return array_map('intval', $this->displayOnlyDomainIds);
+    }
 }
diff --git a/src/Model/Administrator/AdministratorData.php b/src/Model/Administrator/AdministratorData.php
index cd5442b460..808a79a5d3 100644
--- a/src/Model/Administrator/AdministratorData.php
+++ b/src/Model/Administrator/AdministratorData.php
@@ -44,10 +44,16 @@ class AdministratorData
      */
     public $roleGroup;
 
+    /**
+     * @var int[]|null
+     */
+    public $displayOnlyDomainIds;
+
     public function __construct()
     {
         $this->roles[] = Roles::ROLE_ADMIN;
         $this->transferIssuesLastSeenDateTime = new DateTime('1970-01-01 00:00:00');
         $this->roleGroup = null;
+        $this->displayOnlyDomainIds = [1];
     }
 }
diff --git a/src/Model/Administrator/AdministratorDataFactory.php b/src/Model/Administrator/AdministratorDataFactory.php
index 4dc228541e..eaa2f2d239 100644
--- a/src/Model/Administrator/AdministratorDataFactory.php
+++ b/src/Model/Administrator/AdministratorDataFactory.php
@@ -4,8 +4,18 @@
 
 namespace Shopsys\FrameworkBundle\Model\Administrator;
 
+use Shopsys\FrameworkBundle\Component\Domain\Domain;
+
 class AdministratorDataFactory implements AdministratorDataFactoryInterface
 {
+    /**
+     * @param \Shopsys\FrameworkBundle\Component\Domain\Domain $domain
+     */
+    public function __construct(
+        protected readonly Domain $domain,
+    ) {
+    }
+
     /**
      * @return \Shopsys\FrameworkBundle\Model\Administrator\AdministratorData
      */
@@ -19,7 +29,11 @@ protected function createInstance(): AdministratorData
      */
     public function create(): AdministratorData
     {
-        return $this->createInstance();
+        $administratorData = $this->createInstance();
+
+        $administratorData->displayOnlyDomainIds = $this->domain->getAllIds();
+
+        return $administratorData;
     }
 
     /**
@@ -46,6 +60,7 @@ protected function fillFromAdministrator(AdministratorData $administratorData, A
         $administratorData->roles = $administrator->getRoles();
         $administratorData->transferIssuesLastSeenDateTime = $administrator->getTransferIssuesLastSeenDateTime();
         $administratorData->roleGroup = $administrator->getRoleGroup();
+        $administratorData->displayOnlyDomainIds = $administrator->getDisplayOnlyDomainIds();
 
         if ($administrator->getRoleGroup() !== null) {
             $administratorData->roles = [];
diff --git a/src/Resources/translations/messages.cs.po b/src/Resources/translations/messages.cs.po
index bc52d62f09..efbd21e481 100644
--- a/src/Resources/translations/messages.cs.po
+++ b/src/Resources/translations/messages.cs.po
@@ -295,6 +295,9 @@ msgstr "Použitelné proměnné pro obsah"
 msgid "Applicable variables for Subject"
 msgstr "Použitelné proměnné pro předmět"
 
+msgid "Apply"
+msgstr "Použít"
+
 msgid "Apply according to customer"
 msgstr "Aplikovat podle zákazníka"
 
@@ -1366,6 +1369,9 @@ msgstr "Doména %domainName%"
 msgid "Domain <strong>{{ name }}</strong> modified. Try clearing your browser cache (CTRL+F5) if you can't see the new icon."
 msgstr "Byla upravena doména <strong>{{ name }}</strong>. Nevidíte-li novou ikonu, zkuste smazat cache vašeho prohlížeče (CTRL+F5)."
 
+msgid "Domain filter"
+msgstr "Filtr domén"
+
 msgid "Domain name"
 msgstr "Název domény"
 
@@ -3052,6 +3058,9 @@ msgstr "Prosím vyplňte všechny výchozí hodnoty před vytvořením produktu"
 msgid "Please scan the QR code below using a one-time passcode generator application (such as Google Authenticator)."
 msgstr "Naskenujte prosím níže uvedený QR kód pomocí aplikace pro generování jednorázových přístupových kódů (jako je Google Authenticator)."
 
+msgid "Please select at least one domain."
+msgstr "Vyberte prosím alespoň jednu doménu."
+
 msgid "Please use the button below to send the one-time passcode to your email address."
 msgstr "Použijte prosím tlačítko níže k odeslání jednorázového přístupového kódu na vaši e-mailovou adresu."
 
@@ -4506,4 +4515,3 @@ msgstr "{1} Byl vytvořen <strong>%count%</strong> slevový kupón|[2,4] Byly vy
 
 msgid "{1}Sales representative \"%label%\" is assigned to %count% customer and will be removed if you proceed.<br><br> Customer:<br> %customersEnumeration%<br><br> Do you really want to remove sales representative \"%label%\" permanently? |[2,10]Sales representative \"%label%\" is assigned to %count% customers and will be removed if you proceed.<br><br> Customers:<br> %customersEnumeration%<br><br> Do you really want to remove sales representative \"%label%\" permanently? |[11,Inf]Sales representative \"%label%\" is assigned to %count% customers and will be removed if you proceed.<br><br> Customers:<br> %customersEnumeration%<br> +%extraCount% more<br><br> Do you really want to remove sales representative \"%label%\" permanently?"
 msgstr "{1}Obchodní zástupce \"%label%\" je přiřazen k %count% zákazníkovi a bude odstraněn, pokud budete pokračovat.<br><br>Zákazník:<br>%customersEnumeration%<br><br>Opravdu chcete obchodního zástupce \"%label%\" trvale odstranit?|[2,10]Obchodní zástupce \"%label%\" je přiřazen k %count% zákazníkům a bude odstraněn, pokud budete pokračovat.<br><br>Zákazníci:<br>%customersEnumeration%<br><br>Opravdu chcete obchodního zástupce \"%label%\" trvale odstranit?|[11,14]Obchodní zástupce \"%label%\" je přiřazen k %count% zákazníkům a bude odstraněn, pokud budete pokračovat.<br><br>Zákazníci:<br>%customersEnumeration%<br>+%extraCount% další<br><br>Opravdu chcete obchodního zástupce \"%label%\" trvale odstranit?|[15,Inf]Obchodní zástupce \"%label%\" je přiřazen k %count% zákazníkům a bude odstraněn, pokud budete pokračovat.<br><br>Zákazníci:<br>%customersEnumeration%<br>+%extraCount% dalších<br><br>Opravdu chcete obchodního zástupce \"%label%\" trvale odstranit?"
-
diff --git a/src/Resources/translations/messages.en.po b/src/Resources/translations/messages.en.po
index e2c5eb72fc..c43f10ef7a 100644
--- a/src/Resources/translations/messages.en.po
+++ b/src/Resources/translations/messages.en.po
@@ -295,6 +295,9 @@ msgstr ""
 msgid "Applicable variables for Subject"
 msgstr ""
 
+msgid "Apply"
+msgstr ""
+
 msgid "Apply according to customer"
 msgstr ""
 
@@ -1366,6 +1369,9 @@ msgstr ""
 msgid "Domain <strong>{{ name }}</strong> modified. Try clearing your browser cache (CTRL+F5) if you can't see the new icon."
 msgstr ""
 
+msgid "Domain filter"
+msgstr ""
+
 msgid "Domain name"
 msgstr ""
 
@@ -3052,6 +3058,9 @@ msgstr ""
 msgid "Please scan the QR code below using a one-time passcode generator application (such as Google Authenticator)."
 msgstr ""
 
+msgid "Please select at least one domain."
+msgstr ""
+
 msgid "Please use the button below to send the one-time passcode to your email address."
 msgstr ""
 
@@ -4506,4 +4515,3 @@ msgstr ""
 
 msgid "{1}Sales representative \"%label%\" is assigned to %count% customer and will be removed if you proceed.<br><br> Customer:<br> %customersEnumeration%<br><br> Do you really want to remove sales representative \"%label%\" permanently? |[2,10]Sales representative \"%label%\" is assigned to %count% customers and will be removed if you proceed.<br><br> Customers:<br> %customersEnumeration%<br><br> Do you really want to remove sales representative \"%label%\" permanently? |[11,Inf]Sales representative \"%label%\" is assigned to %count% customers and will be removed if you proceed.<br><br> Customers:<br> %customersEnumeration%<br> +%extraCount% more<br><br> Do you really want to remove sales representative \"%label%\" permanently?"
 msgstr ""
-
diff --git a/src/Resources/views/Admin/Form/adminDomainsForm.html.twig b/src/Resources/views/Admin/Form/adminDomainsForm.html.twig
new file mode 100644
index 0000000000..753aad9f45
--- /dev/null
+++ b/src/Resources/views/Admin/Form/adminDomainsForm.html.twig
@@ -0,0 +1,10 @@
+{{ form_start(form, {'action': path('admin_domains_filter'), 'method': 'POST'}) }}
+    <ul class="js-toggle-menu-submenu box-dropdown__options multi-column-list">
+        {% for child in form.domains %}
+            <li class="box-dropdown__options__item">
+                {{ form_row(child) }}
+            </li>
+        {% endfor %}
+        {{ form_row(form.apply) }}
+    </ul>
+{{ form_end(form) }}
diff --git a/src/Resources/views/Admin/Inline/Menu/menu.html.twig b/src/Resources/views/Admin/Inline/Menu/menu.html.twig
index 465f892577..1bc317ab7d 100644
--- a/src/Resources/views/Admin/Inline/Menu/menu.html.twig
+++ b/src/Resources/views/Admin/Inline/Menu/menu.html.twig
@@ -1,4 +1,25 @@
 <ul class="js-toggle-menu navig navig--side">
+
+    {% if isMultidomain() %}
+        <li class="js-toggle-menu-item navig__item">
+            <div class="box-dropdown">
+                <div
+                        class="box-dropdown__select box-dropdown__select--menu"
+                        title="{{ 'Domain filter'|trans }}"
+                >
+                    <i class="svg svg-menu"></i>
+                    <span class="box-dropdown__select__text">
+                        {{ 'Domain filter'|trans }}
+                    </span>
+                    <i class="box-dropdown__select__arrow box-dropdown__select__arrow--up"></i>
+                    <i class="box-dropdown__select__arrow box-dropdown__select__arrow--down"></i>
+                </div>
+
+                {{ render(controller('Shopsys\\FrameworkBundle\\Controller\\Admin\\SelectAdminDomainsController::renderFormAction')) }}
+            </div>
+        </li>
+    {% endif %}
+
     <li class="js-toggle-menu-item navig__item">
         <div class="box-dropdown">
             <div
@@ -12,13 +33,16 @@
                 <i class="box-dropdown__select__arrow box-dropdown__select__arrow--up"></i>
                 <i class="box-dropdown__select__arrow box-dropdown__select__arrow--down"></i>
             </div>
-            <ul class="js-toggle-menu-submenu box-dropdown__options multi-column-list">
-                {% for domainConfig in domainConfigs %}
-                    <li class="box-dropdown__options__item">
-                        <a href="{{ domainConfig.url }}" target="_blank" class="box-dropdown__options__item__link" title="{{ domainConfig.name }}">{{ domainConfig.url }}</a>
-                    </li>
-                {% endfor %}
-            </ul>
+            <div class="js-toggle-menu-submenu box-dropdown__options">
+                <ul class="multi-column-list">
+                    {% for domainConfig in domainConfigs %}
+                        <li class="box-dropdown__options__item">
+                            <a href="{{ domainConfig.url }}" target="_blank" class="box-dropdown__options__item__link"
+                               title="{{ domainConfig.name }}">{{ domainConfig.url }}</a>
+                        </li>
+                    {% endfor %}
+                </ul>
+            </div>
         </div>
     </li>
 
@@ -37,12 +61,14 @@
             </div>
             <ul class="js-toggle-menu-submenu box-dropdown__options">
                 <li class="box-dropdown__options__item">
-                    <a href="{{ url('admin_administrator_myaccount') }}" class="box-dropdown__options__item__link" title="{{ 'My account'|trans }}">
+                    <a href="{{ url('admin_administrator_myaccount') }}" class="box-dropdown__options__item__link"
+                       title="{{ 'My account'|trans }}">
                         {{ 'My account'|trans }}
                     </a>
                 </li>
                 <li class="box-dropdown__options__item">
-                    <a href="{{ url('admin_logout', { _csrf_token: csrf_token('admin_logout')}) }}" class="box-dropdown__options__item__link" title="{{ 'Log out'|trans }}">
+                    <a href="{{ url('admin_logout', { _csrf_token: csrf_token('admin_logout')}) }}"
+                       class="box-dropdown__options__item__link" title="{{ 'Log out'|trans }}">
                         {{ 'Log out'|trans }}
                     </a>
                 </li>

From b1f798bd6d2a0d6551dc5056948b5fb6d21d6982 Mon Sep 17 00:00:00 2001
From: Martin Grossmann <martin@vyvoj.net>
Date: Tue, 16 Jul 2024 10:53:21 +0200
Subject: [PATCH 03/32] removed unused dependency

---
 src/Model/Pricing/Group/PricingGroupFacade.php | 18 ------------------
 src/Model/Product/ProductFacade.php            |  2 --
 2 files changed, 20 deletions(-)

diff --git a/src/Model/Pricing/Group/PricingGroupFacade.php b/src/Model/Pricing/Group/PricingGroupFacade.php
index 20a682d488..72e61a4de3 100644
--- a/src/Model/Pricing/Group/PricingGroupFacade.php
+++ b/src/Model/Pricing/Group/PricingGroupFacade.php
@@ -5,7 +5,6 @@
 namespace Shopsys\FrameworkBundle\Model\Pricing\Group;
 
 use Doctrine\ORM\EntityManagerInterface;
-use Shopsys\FrameworkBundle\Component\Domain\Domain;
 use Shopsys\FrameworkBundle\Model\Customer\User\CustomerUserRepository;
 use Shopsys\FrameworkBundle\Model\Product\ProductVisibilityFacade;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -15,7 +14,6 @@ class PricingGroupFacade
     /**
      * @param \Doctrine\ORM\EntityManagerInterface $em
      * @param \Shopsys\FrameworkBundle\Model\Pricing\Group\PricingGroupRepository $pricingGroupRepository
-     * @param \Shopsys\FrameworkBundle\Component\Domain\Domain $domain
      * @param \Shopsys\FrameworkBundle\Model\Pricing\Group\PricingGroupSettingFacade $pricingGroupSettingFacade
      * @param \Shopsys\FrameworkBundle\Model\Product\ProductVisibilityFacade $productVisibilityFacade
      * @param \Shopsys\FrameworkBundle\Model\Customer\User\CustomerUserRepository $customerUserRepository
@@ -25,7 +23,6 @@ class PricingGroupFacade
     public function __construct(
         protected readonly EntityManagerInterface $em,
         protected readonly PricingGroupRepository $pricingGroupRepository,
-        protected readonly Domain $domain,
         protected readonly PricingGroupSettingFacade $pricingGroupSettingFacade,
         protected readonly ProductVisibilityFacade $productVisibilityFacade,
         protected readonly CustomerUserRepository $customerUserRepository,
@@ -138,21 +135,6 @@ public function getAllExceptIdByDomainId($id, $domainId)
         return $this->pricingGroupRepository->getAllExceptIdByDomainId($id, $domainId);
     }
 
-    /**
-     * @return \Shopsys\FrameworkBundle\Model\Pricing\Group\PricingGroup[][]
-     */
-    public function getAllIndexedByDomainId()
-    {
-        $pricingGroupsByDomainId = [];
-
-        foreach ($this->domain->getAll() as $domain) {
-            $domainId = $domain->getId();
-            $pricingGroupsByDomainId[$domainId] = $this->pricingGroupRepository->getPricingGroupsByDomainId($domainId);
-        }
-
-        return $pricingGroupsByDomainId;
-    }
-
     /**
      * @param \Shopsys\FrameworkBundle\Model\Pricing\Group\PricingGroup $pricingGroup
      * @param string $eventType
diff --git a/src/Model/Product/ProductFacade.php b/src/Model/Product/ProductFacade.php
index bbc85082c3..f29dd6f176 100644
--- a/src/Model/Product/ProductFacade.php
+++ b/src/Model/Product/ProductFacade.php
@@ -32,7 +32,6 @@ class ProductFacade
     /**
      * @param \Doctrine\ORM\EntityManagerInterface $em
      * @param \Shopsys\FrameworkBundle\Model\Product\ProductRepository $productRepository
-     * @param \Shopsys\FrameworkBundle\Model\Product\ProductVisibilityFacade $productVisibilityFacade
      * @param \Shopsys\FrameworkBundle\Model\Product\Parameter\ParameterRepository $parameterRepository
      * @param \Shopsys\FrameworkBundle\Component\Domain\Domain $domain
      * @param \Shopsys\FrameworkBundle\Component\Image\ImageFacade $imageFacade
@@ -55,7 +54,6 @@ class ProductFacade
     public function __construct(
         protected readonly EntityManagerInterface $em,
         protected readonly ProductRepository $productRepository,
-        protected readonly ProductVisibilityFacade $productVisibilityFacade,
         protected readonly ParameterRepository $parameterRepository,
         protected readonly Domain $domain,
         protected readonly ImageFacade $imageFacade,

From 423fe7bba37782c3c1f661e8ba020ac1bc0ee668 Mon Sep 17 00:00:00 2001
From: Martin Grossmann <martin@vyvoj.net>
Date: Tue, 3 Sep 2024 21:45:24 +0200
Subject: [PATCH 04/32] multidomain form types now take into account the
 filtered edit domains

---
 src/Component/Domain/Domain.php               | 39 ++++++++++++++++++-
 src/Component/Domain/DomainFactory.php        |  5 ++-
 .../DomainFactoryOverwritingDomainUrl.php     |  5 ++-
 .../Router/FriendlyUrl/FriendlyUrlFacade.php  | 11 ++++++
 .../FriendlyUrl/FriendlyUrlRepository.php     | 23 +++++++++++
 src/Form/UrlListType.php                      | 24 +++---------
 .../Administrator/AdministratorFacade.php     | 15 +++++++
 .../UniqueSlugsOnDomainsValidatorTest.php     |  4 +-
 .../Domain/DomainDataCreatorTest.php          |  9 +++--
 .../Component/Domain/DomainSubscriberTest.php |  4 +-
 tests/Unit/Component/Domain/DomainTest.php    | 20 +++++++---
 .../Localization/DateTimeFormatterTest.php    |  4 +-
 .../Router/CurrentDomainRouterTest.php        |  4 +-
 .../Router/DomainRouterFactoryTest.php        |  4 +-
 .../FriendlyUrl/FriendlyUrlFactoryTest.php    |  4 +-
 .../FriendlyUrlUniqueResultFactoryTest.php    | 10 +++--
 tests/Unit/Form/DateTimeTypeTest.php          |  4 +-
 tests/Unit/Model/Feed/FeedCronModuleTest.php  |  4 +-
 .../Model/Order/OrderFacadeHeurekaTest.php    |  4 +-
 .../Twig/DateTimeFormatterExtensionTest.php   |  4 +-
 20 files changed, 156 insertions(+), 45 deletions(-)

diff --git a/src/Component/Domain/Domain.php b/src/Component/Domain/Domain.php
index d99a5f0117..29907022bd 100644
--- a/src/Component/Domain/Domain.php
+++ b/src/Component/Domain/Domain.php
@@ -12,6 +12,7 @@
 use Shopsys\FrameworkBundle\Component\Domain\Exception\UnableToResolveDomainException;
 use Shopsys\FrameworkBundle\Component\Setting\Exception\SettingValueNotFoundException;
 use Shopsys\FrameworkBundle\Component\Setting\Setting;
+use Shopsys\FrameworkBundle\Model\Administrator\AdministratorFacade;
 use Symfony\Component\HttpFoundation\Request;
 
 class Domain implements DomainIdsProviderInterface
@@ -26,10 +27,12 @@ class Domain implements DomainIdsProviderInterface
     /**
      * @param \Shopsys\FrameworkBundle\Component\Domain\Config\DomainConfig[] $domainConfigs
      * @param \Shopsys\FrameworkBundle\Component\Setting\Setting $setting
+     * @param \Shopsys\FrameworkBundle\Model\Administrator\AdministratorFacade $administratorFacade
      */
     public function __construct(
-        protected array $domainConfigs,
-        protected Setting $setting,
+        protected readonly array $domainConfigs,
+        protected readonly Setting $setting,
+        protected readonly AdministratorFacade $administratorFacade,
     ) {
     }
 
@@ -229,4 +232,36 @@ public function findFirstB2bDomain(): ?DomainConfig
 
         return null;
     }
+
+    /**
+     * @return int[]
+     */
+    public function getAdminEnabledDomainIds(): array
+    {
+        $selectedDomainIds = $this->administratorFacade->getCurrentlyLoggedAdministrator()->getDisplayOnlyDomainIds();
+
+        return count($selectedDomainIds) > 0 ? $selectedDomainIds : $this->getAllIds();
+    }
+
+    /**
+     * @return \Shopsys\FrameworkBundle\Component\Domain\Config\DomainConfig[]
+     */
+    public function getAdminEnabledDomains(): array
+    {
+        $domains = [];
+
+        foreach ($this->getAdminEnabledDomainIds() as $selectedDomainId) {
+            $domains[$selectedDomainId] = $this->getDomainConfigById($selectedDomainId);
+        }
+
+        return $domains;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasAdminAllDomainsEnabled(): bool
+    {
+        return count($this->getAdminEnabledDomainIds()) === count($this->getAllIds());
+    }
 }
diff --git a/src/Component/Domain/DomainFactory.php b/src/Component/Domain/DomainFactory.php
index e5ccddaf75..b951687633 100644
--- a/src/Component/Domain/DomainFactory.php
+++ b/src/Component/Domain/DomainFactory.php
@@ -6,16 +6,19 @@
 
 use Shopsys\FrameworkBundle\Component\Domain\Config\DomainsConfigLoader;
 use Shopsys\FrameworkBundle\Component\Setting\Setting;
+use Shopsys\FrameworkBundle\Model\Administrator\AdministratorFacade;
 
 class DomainFactory
 {
     /**
      * @param \Shopsys\FrameworkBundle\Component\Domain\Config\DomainsConfigLoader $domainsConfigLoader
      * @param \Shopsys\FrameworkBundle\Component\Setting\Setting $setting
+     * @param \Shopsys\FrameworkBundle\Model\Administrator\AdministratorFacade $administratorFacade
      */
     public function __construct(
         protected readonly DomainsConfigLoader $domainsConfigLoader,
         protected readonly Setting $setting,
+        protected readonly AdministratorFacade $administratorFacade,
     ) {
     }
 
@@ -30,7 +33,7 @@ public function create($domainsConfigFilepath, $domainsUrlsConfigFilepath)
             $domainsConfigFilepath,
             $domainsUrlsConfigFilepath,
         );
-        $domain = new Domain($domainConfigs, $this->setting);
+        $domain = new Domain($domainConfigs, $this->setting, $this->administratorFacade);
 
         $domainId = getenv('DOMAIN');
 
diff --git a/src/Component/Domain/DomainFactoryOverwritingDomainUrl.php b/src/Component/Domain/DomainFactoryOverwritingDomainUrl.php
index d86576bb6d..5814f9d941 100644
--- a/src/Component/Domain/DomainFactoryOverwritingDomainUrl.php
+++ b/src/Component/Domain/DomainFactoryOverwritingDomainUrl.php
@@ -7,6 +7,7 @@
 use Shopsys\FrameworkBundle\Component\Domain\Config\DomainConfig;
 use Shopsys\FrameworkBundle\Component\Domain\Config\DomainsConfigLoader;
 use Shopsys\FrameworkBundle\Component\Setting\Setting;
+use Shopsys\FrameworkBundle\Model\Administrator\AdministratorFacade;
 
 class DomainFactoryOverwritingDomainUrl
 {
@@ -16,11 +17,13 @@ class DomainFactoryOverwritingDomainUrl
      * @param string|null $overwriteDomainUrl
      * @param \Shopsys\FrameworkBundle\Component\Domain\Config\DomainsConfigLoader $domainsConfigLoader
      * @param \Shopsys\FrameworkBundle\Component\Setting\Setting $setting
+     * @param \Shopsys\FrameworkBundle\Model\Administrator\AdministratorFacade $administratorFacade
      */
     public function __construct(
         $overwriteDomainUrl,
         protected readonly DomainsConfigLoader $domainsConfigLoader,
         protected readonly Setting $setting,
+        protected readonly AdministratorFacade $administratorFacade,
     ) {
         $this->overwriteDomainUrl = $overwriteDomainUrl;
     }
@@ -41,7 +44,7 @@ public function create($domainsConfigFilepath, $domainsUrlsConfigFilepath)
             $domainConfigs = $this->overwriteDomainUrl($domainConfigs);
         }
 
-        $domain = new Domain($domainConfigs, $this->setting);
+        $domain = new Domain($domainConfigs, $this->setting, $this->administratorFacade);
 
         $domainId = getenv('DOMAIN');
 
diff --git a/src/Component/Router/FriendlyUrl/FriendlyUrlFacade.php b/src/Component/Router/FriendlyUrl/FriendlyUrlFacade.php
index 050b4ccd04..ff381fd191 100644
--- a/src/Component/Router/FriendlyUrl/FriendlyUrlFacade.php
+++ b/src/Component/Router/FriendlyUrl/FriendlyUrlFacade.php
@@ -129,6 +129,17 @@ public function getAllByRouteNameAndEntityId($routeName, $entityId)
         return $this->friendlyUrlRepository->getAllByRouteNameAndEntityId($routeName, $entityId);
     }
 
+    /**
+     * @param string $routeName
+     * @param int $entityId
+     * @param int[] $domainIds
+     * @return \Shopsys\FrameworkBundle\Component\Router\FriendlyUrl\FriendlyUrl[]
+     */
+    public function getAllByRouteNameDomainIdsAndEntityIds(string $routeName, int $entityId, array $domainIds): array
+    {
+        return $this->friendlyUrlRepository->getAllByRouteNameDomainIdsAndEntityIds($routeName, $entityId, $domainIds);
+    }
+
     /**
      * @param int $domainId
      * @param string $routeName
diff --git a/src/Component/Router/FriendlyUrl/FriendlyUrlRepository.php b/src/Component/Router/FriendlyUrl/FriendlyUrlRepository.php
index 1f29af0ea6..9bbf9240bf 100644
--- a/src/Component/Router/FriendlyUrl/FriendlyUrlRepository.php
+++ b/src/Component/Router/FriendlyUrl/FriendlyUrlRepository.php
@@ -138,6 +138,29 @@ public function getAllByRouteNameAndEntityId($routeName, $entityId)
         );
     }
 
+    /**
+     * @param string $routeName
+     * @param int $entityId
+     * @param int[] $domainIds
+     * @return \Shopsys\FrameworkBundle\Component\Router\FriendlyUrl\FriendlyUrl[]
+     */
+    public function getAllByRouteNameDomainIdsAndEntityIds(string $routeName, int $entityId, array $domainIds): array
+    {
+        $criteria = [
+            'routeName' => $routeName,
+            'entityId' => $entityId,
+            'domainId' => $domainIds,
+        ];
+
+        return $this->getFriendlyUrlRepository()->findBy(
+            $criteria,
+            [
+                'domainId' => 'ASC',
+                'slug' => 'ASC',
+            ],
+        );
+    }
+
     /**
      * @param string $routeName
      * @param int $entityId
diff --git a/src/Form/UrlListType.php b/src/Form/UrlListType.php
index 158763d9b2..53d972694e 100644
--- a/src/Form/UrlListType.php
+++ b/src/Form/UrlListType.php
@@ -102,7 +102,6 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         $view->vars['routeName'] = $options['route_name'];
         $view->vars['entityId'] = $options['entity_id'];
         $view->vars['mainUrlsSlugsOnDomains'] = $mainUrlsSlugsOnDomains;
-        $view->vars['domainUrlsById'] = $this->getDomainUrlsIndexedById();
     }
 
     /**
@@ -128,7 +127,11 @@ private function getFriendlyUrlsIndexedByDomain($routeName, $entityId)
         $friendlyUrlsByDomain = [];
 
         if ($entityId !== null) {
-            $friendlyUrls = $this->friendlyUrlFacade->getAllByRouteNameAndEntityId($routeName, $entityId);
+            $friendlyUrls = $this->friendlyUrlFacade->getAllByRouteNameDomainIdsAndEntityIds(
+                $routeName,
+                $entityId,
+                $this->domain->getAdminEnabledDomainIds(),
+            );
 
             foreach ($friendlyUrls as $friendlyUrl) {
                 $friendlyUrlsByDomain[$friendlyUrl->getDomainId()][] = $friendlyUrl;
@@ -174,8 +177,7 @@ private function getMainFriendlyUrlSlugsIndexedByDomainId($routeName, $entityId)
     {
         $mainFriendlyUrlsSlugsByDomainId = [];
 
-        foreach ($this->domain->getAll() as $domainConfig) {
-            $domainId = $domainConfig->getId();
+        foreach ($this->domain->getAdminEnabledDomainIds() as $domainId) {
             $mainFriendlyUrl = $this->friendlyUrlFacade->findMainFriendlyUrl(
                 $domainId,
                 $routeName,
@@ -191,18 +193,4 @@ private function getMainFriendlyUrlSlugsIndexedByDomainId($routeName, $entityId)
 
         return $mainFriendlyUrlsSlugsByDomainId;
     }
-
-    /**
-     * @return string[]
-     */
-    private function getDomainUrlsIndexedById()
-    {
-        $domainUrlsById = [];
-
-        foreach ($this->domain->getAll() as $domainConfig) {
-            $domainUrlsById[$domainConfig->getId()] = $domainConfig->getUrl();
-        }
-
-        return $domainUrlsById;
-    }
 }
diff --git a/src/Model/Administrator/AdministratorFacade.php b/src/Model/Administrator/AdministratorFacade.php
index 441173d785..aa381a380a 100644
--- a/src/Model/Administrator/AdministratorFacade.php
+++ b/src/Model/Administrator/AdministratorFacade.php
@@ -12,6 +12,7 @@
 use Shopsys\FrameworkBundle\Model\Administrator\Exception\DeletingSuperadminException;
 use Shopsys\FrameworkBundle\Model\Administrator\Exception\DuplicateUserNameException;
 use Shopsys\FrameworkBundle\Model\Administrator\Role\AdministratorRoleFacade;
+use Shopsys\FrameworkBundle\Model\Administrator\Security\Exception\AdministratorIsNotLoggedException;
 use Symfony\Component\PasswordHasher\Hasher\PasswordHasherFactoryInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 
@@ -200,4 +201,18 @@ public function findByUuid(string $uuid): ?Administrator
     {
         return $this->administratorRepository->findByUuid($uuid);
     }
+
+    /**
+     * @return \Shopsys\FrameworkBundle\Model\Administrator\Administrator
+     */
+    public function getCurrentlyLoggedAdministrator(): Administrator
+    {
+        $administrator = $this->tokenStorage->getToken()?->getUser();
+
+        if (!$administrator instanceof Administrator) {
+            throw new AdministratorIsNotLoggedException('Administrator is not logged.');
+        }
+
+        return $administrator;
+    }
 }
diff --git a/tests/Unit/Component/Constraints/UniqueSlugsOnDomainsValidatorTest.php b/tests/Unit/Component/Constraints/UniqueSlugsOnDomainsValidatorTest.php
index 7b33f20aa4..04a3f24ae2 100644
--- a/tests/Unit/Component/Constraints/UniqueSlugsOnDomainsValidatorTest.php
+++ b/tests/Unit/Component/Constraints/UniqueSlugsOnDomainsValidatorTest.php
@@ -12,6 +12,7 @@
 use Shopsys\FrameworkBundle\Component\Setting\Setting;
 use Shopsys\FrameworkBundle\Form\Constraints\UniqueSlugsOnDomains;
 use Shopsys\FrameworkBundle\Form\Constraints\UniqueSlugsOnDomainsValidator;
+use Shopsys\FrameworkBundle\Model\Administrator\AdministratorFacade;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
@@ -29,7 +30,8 @@ protected function createValidator()
             new DomainConfig(Domain::SECOND_DOMAIN_ID, 'http://example.com', 'name2', 'en', $defaultTimeZone),
         ];
         $settingMock = $this->createMock(Setting::class);
-        $domain = new Domain($domainConfigs, $settingMock);
+        $administratorFacadeMock = $this->createMock(AdministratorFacade::class);
+        $domain = new Domain($domainConfigs, $settingMock, $administratorFacadeMock);
 
         $routerMock = $this->getMockBuilder(RouterInterface::class)->getMock();
         $routerMock->method('match')->willReturnCallback(function ($path) {
diff --git a/tests/Unit/Component/Domain/DomainDataCreatorTest.php b/tests/Unit/Component/Domain/DomainDataCreatorTest.php
index 305d3b869b..f4946ad5db 100644
--- a/tests/Unit/Component/Domain/DomainDataCreatorTest.php
+++ b/tests/Unit/Component/Domain/DomainDataCreatorTest.php
@@ -15,6 +15,7 @@
 use Shopsys\FrameworkBundle\Component\Setting\Setting;
 use Shopsys\FrameworkBundle\Component\Setting\SettingValueRepository;
 use Shopsys\FrameworkBundle\Component\Translation\TranslatableEntityDataCreator;
+use Shopsys\FrameworkBundle\Model\Administrator\AdministratorFacade;
 use Shopsys\FrameworkBundle\Model\Pricing\Group\PricingGroup;
 use Shopsys\FrameworkBundle\Model\Pricing\Group\PricingGroupData;
 use Shopsys\FrameworkBundle\Model\Pricing\Group\PricingGroupDataFactory;
@@ -40,8 +41,8 @@ public function testCreateNewDomainsDataNoNewDomain()
             ->method('getForDomain')
             ->with($this->equalTo(Setting::DOMAIN_DATA_CREATED), $this->equalTo(1))
             ->willReturn(true);
-
-        $domain = new Domain($domainConfigs, $settingMock);
+        $administratorFacadeMock = $this->createMock(AdministratorFacade::class);
+        $domain = new Domain($domainConfigs, $settingMock, $administratorFacadeMock);
 
         $settingValueRepositoryMock = $this->createMock(SettingValueRepository::class);
         $multidomainEntityDataCreatorMock = $this->createMock(MultidomainEntityDataCreator::class);
@@ -96,8 +97,8 @@ function () {
 
                 throw new SettingValueNotFoundException();
             });
-
-        $domain = new Domain($domainConfigs, $settingMock);
+        $administratorFacadeMock = $this->createMock(AdministratorFacade::class);
+        $domain = new Domain($domainConfigs, $settingMock, $administratorFacadeMock);
 
         $settingValueRepositoryMock = $this->createMock(SettingValueRepository::class);
         $settingValueRepositoryMock
diff --git a/tests/Unit/Component/Domain/DomainSubscriberTest.php b/tests/Unit/Component/Domain/DomainSubscriberTest.php
index 77de845308..ed13194fbb 100644
--- a/tests/Unit/Component/Domain/DomainSubscriberTest.php
+++ b/tests/Unit/Component/Domain/DomainSubscriberTest.php
@@ -9,6 +9,7 @@
 use Shopsys\FrameworkBundle\Component\Domain\DomainSubscriber;
 use Shopsys\FrameworkBundle\Component\Domain\Exception\NoDomainSelectedException;
 use Shopsys\FrameworkBundle\Component\Setting\Setting;
+use Shopsys\FrameworkBundle\Model\Administrator\AdministratorFacade;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
@@ -24,8 +25,9 @@ public function testOnKernelRequestWithoutMasterRequest(): void
         );
 
         $settingMock = $this->createMock(Setting::class);
+        $administratorFacadeMock = $this->createMock(AdministratorFacade::class);
 
-        $domain = new Domain([], $settingMock);
+        $domain = new Domain([], $settingMock, $administratorFacadeMock);
 
         $domainSubscriber = new DomainSubscriber($domain);
         $domainSubscriber->onKernelRequest($event);
diff --git a/tests/Unit/Component/Domain/DomainTest.php b/tests/Unit/Component/Domain/DomainTest.php
index 43b474d6f1..65978adfbd 100644
--- a/tests/Unit/Component/Domain/DomainTest.php
+++ b/tests/Unit/Component/Domain/DomainTest.php
@@ -12,6 +12,7 @@
 use Shopsys\FrameworkBundle\Component\Domain\Exception\NoDomainSelectedException;
 use Shopsys\FrameworkBundle\Component\Setting\Exception\SettingValueNotFoundException;
 use Shopsys\FrameworkBundle\Component\Setting\Setting;
+use Shopsys\FrameworkBundle\Model\Administrator\AdministratorFacade;
 use Symfony\Component\HttpFoundation\Request;
 
 class DomainTest extends TestCase
@@ -50,8 +51,9 @@ private function getDomainConfigs(): array
     public function testGetIdNotSet(): void
     {
         $settingMock = $this->createMock(Setting::class);
+        $administratorFacadeMock = $this->createMock(AdministratorFacade::class);
 
-        $domain = new Domain($this->getDomainConfigs(), $settingMock);
+        $domain = new Domain($this->getDomainConfigs(), $settingMock, $administratorFacadeMock);
         $this->expectException(NoDomainSelectedException::class);
         $domain->getId();
     }
@@ -59,8 +61,9 @@ public function testGetIdNotSet(): void
     public function testSwitchDomainByRequest(): void
     {
         $settingMock = $this->createMock(Setting::class);
+        $administratorFacadeMock = $this->createMock(AdministratorFacade::class);
 
-        $domain = new Domain($this->getDomainConfigs(), $settingMock);
+        $domain = new Domain($this->getDomainConfigs(), $settingMock, $administratorFacadeMock);
 
         $requestMock = $this->getMockBuilder(Request::class)
             ->onlyMethods(['getSchemeAndHttpHost'])
@@ -80,8 +83,9 @@ public function testGetAllIncludingDomainConfigsWithoutDataCreated(): void
     {
         $domainConfigs = $this->getDomainConfigs();
         $settingMock = $this->createMock(Setting::class);
+        $administratorFacadeMock = $this->createMock(AdministratorFacade::class);
 
-        $domain = new Domain($domainConfigs, $settingMock);
+        $domain = new Domain($domainConfigs, $settingMock, $administratorFacadeMock);
 
         $this->assertSame($domainConfigs, $domain->getAllIncludingDomainConfigsWithoutDataCreated());
     }
@@ -108,7 +112,9 @@ public function testGetAll(): void
                 throw new SettingValueNotFoundException();
             });
 
-        $domain = new Domain($domainConfigs, $settingMock);
+        $administratorFacadeMock = $this->createMock(AdministratorFacade::class);
+
+        $domain = new Domain($domainConfigs, $settingMock, $administratorFacadeMock);
 
         $this->assertSame([1 => $domainConfigWithDataCreated], $domain->getAll());
     }
@@ -117,8 +123,9 @@ public function testGetDomainConfigById(): void
     {
         $domainConfigs = $this->getDomainConfigs();
         $settingMock = $this->createMock(Setting::class);
+        $administratorFacadeMock = $this->createMock(AdministratorFacade::class);
 
-        $domain = new Domain($domainConfigs, $settingMock);
+        $domain = new Domain($domainConfigs, $settingMock, $administratorFacadeMock);
 
         $this->assertSame($domainConfigs[0], $domain->getDomainConfigById(Domain::FIRST_DOMAIN_ID));
         $this->assertSame($domainConfigs[1], $domain->getDomainConfigById(Domain::SECOND_DOMAIN_ID));
@@ -136,8 +143,9 @@ public function testGetAllLocales(): void
             new DomainConfig(Domain::THIRD_DOMAIN_ID, 'http://example.cz:8080', 'example.cz', 'cs', $defaultTimeZone),
         ];
         $settingMock = $this->createMock(Setting::class);
+        $administratorFacadeMock = $this->createMock(AdministratorFacade::class);
 
-        $domain = new Domain($domainConfigs, $settingMock);
+        $domain = new Domain($domainConfigs, $settingMock, $administratorFacadeMock);
 
         $expectedLocales = [
             'cs' => 'cs',
diff --git a/tests/Unit/Component/Localization/DateTimeFormatterTest.php b/tests/Unit/Component/Localization/DateTimeFormatterTest.php
index 42f8b01bd4..85d544a270 100644
--- a/tests/Unit/Component/Localization/DateTimeFormatterTest.php
+++ b/tests/Unit/Component/Localization/DateTimeFormatterTest.php
@@ -15,6 +15,7 @@
 use Shopsys\FrameworkBundle\Component\Localization\DateTimeFormatter;
 use Shopsys\FrameworkBundle\Component\Localization\DisplayTimeZoneProvider;
 use Shopsys\FrameworkBundle\Component\Setting\Setting;
+use Shopsys\FrameworkBundle\Model\Administrator\AdministratorFacade;
 
 class DateTimeFormatterTest extends TestCase
 {
@@ -78,7 +79,8 @@ private function getMockedDomain(string $dateTimeZoneString): Domain
             ->getMock();
         $dateTimeZone = new DateTimeZone($dateTimeZoneString);
         $domainConfig = new DomainConfig(1, 'http://example.com', 'name', 'en', $dateTimeZone);
+        $administratorFacadeMock = $this->createMock(AdministratorFacade::class);
 
-        return new Domain([$domainConfig], $settingMock);
+        return new Domain([$domainConfig], $settingMock, $administratorFacadeMock);
     }
 }
diff --git a/tests/Unit/Component/Router/CurrentDomainRouterTest.php b/tests/Unit/Component/Router/CurrentDomainRouterTest.php
index 76f2cd59cb..13457fa635 100644
--- a/tests/Unit/Component/Router/CurrentDomainRouterTest.php
+++ b/tests/Unit/Component/Router/CurrentDomainRouterTest.php
@@ -12,6 +12,7 @@
 use Shopsys\FrameworkBundle\Component\Router\DomainRouter;
 use Shopsys\FrameworkBundle\Component\Router\DomainRouterFactory;
 use Shopsys\FrameworkBundle\Component\Setting\Setting;
+use Shopsys\FrameworkBundle\Model\Administrator\AdministratorFacade;
 use Symfony\Component\Routing\RouteCollection;
 
 class CurrentDomainRouterTest extends TestCase
@@ -21,7 +22,8 @@ public function testDelegateRouter()
         $defaultTimeZone = new DateTimeZone('Europe/Prague');
         $domainConfigs = new DomainConfig(Domain::FIRST_DOMAIN_ID, 'http://example.com:8080', 'example', 'en', $defaultTimeZone);
         $settingMock = $this->createMock(Setting::class);
-        $domain = new Domain([$domainConfigs], $settingMock);
+        $administratorFacadeMock = $this->createMock(AdministratorFacade::class);
+        $domain = new Domain([$domainConfigs], $settingMock, $administratorFacadeMock);
         $domain->switchDomainById(Domain::FIRST_DOMAIN_ID);
 
         $generateResult = 'generateResult';
diff --git a/tests/Unit/Component/Router/DomainRouterFactoryTest.php b/tests/Unit/Component/Router/DomainRouterFactoryTest.php
index c263661539..f6610d336d 100644
--- a/tests/Unit/Component/Router/DomainRouterFactoryTest.php
+++ b/tests/Unit/Component/Router/DomainRouterFactoryTest.php
@@ -13,6 +13,7 @@
 use Shopsys\FrameworkBundle\Component\Router\FriendlyUrl\FriendlyUrlRouterFactory;
 use Shopsys\FrameworkBundle\Component\Router\LocalizedRouterFactory;
 use Shopsys\FrameworkBundle\Component\Setting\Setting;
+use Shopsys\FrameworkBundle\Model\Administrator\AdministratorFacade;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Routing\RequestContext;
@@ -25,7 +26,8 @@ public function testGetRouter()
         $defaultTimeZone = new DateTimeZone('Europe/Prague');
         $domainConfig = new DomainConfig(Domain::THIRD_DOMAIN_ID, 'http://example.com:8080', 'example', 'en', $defaultTimeZone);
         $settingMock = $this->createMock(Setting::class);
-        $domain = new Domain([$domainConfig], $settingMock);
+        $administratorFacadeMock = $this->createMock(AdministratorFacade::class);
+        $domain = new Domain([$domainConfig], $settingMock, $administratorFacadeMock);
 
         $localizedRouterMock = $this->getMockBuilder(RouterInterface::class)->getMock();
         $friendlyUrlRouterMock = $this->getMockBuilder(FriendlyUrlRouter::class)
diff --git a/tests/Unit/Component/Router/FriendlyUrl/FriendlyUrlFactoryTest.php b/tests/Unit/Component/Router/FriendlyUrl/FriendlyUrlFactoryTest.php
index 07dd57c715..dac03f87ea 100644
--- a/tests/Unit/Component/Router/FriendlyUrl/FriendlyUrlFactoryTest.php
+++ b/tests/Unit/Component/Router/FriendlyUrl/FriendlyUrlFactoryTest.php
@@ -11,6 +11,7 @@
 use Shopsys\FrameworkBundle\Component\EntityExtension\EntityNameResolver;
 use Shopsys\FrameworkBundle\Component\Router\FriendlyUrl\FriendlyUrlFactory;
 use Shopsys\FrameworkBundle\Component\Setting\Setting;
+use Shopsys\FrameworkBundle\Model\Administrator\AdministratorFacade;
 
 class FriendlyUrlFactoryTest extends TestCase
 {
@@ -22,7 +23,8 @@ public function testCreateForAllDomains()
             new DomainConfig(Domain::SECOND_DOMAIN_ID, 'http://example.com', 'example.com', 'en', $defaultTimeZone),
         ];
         $settingMock = $this->createMock(Setting::class);
-        $domain = new Domain($domainConfigs, $settingMock);
+        $administratorFacadeMock = $this->createMock(AdministratorFacade::class);
+        $domain = new Domain($domainConfigs, $settingMock, $administratorFacadeMock);
 
         $friendlyUrlFactory = new FriendlyUrlFactory($domain, new EntityNameResolver([]));
 
diff --git a/tests/Unit/Component/Router/FriendlyUrl/FriendlyUrlUniqueResultFactoryTest.php b/tests/Unit/Component/Router/FriendlyUrl/FriendlyUrlUniqueResultFactoryTest.php
index 1f495207e9..b60f78e6fd 100644
--- a/tests/Unit/Component/Router/FriendlyUrl/FriendlyUrlUniqueResultFactoryTest.php
+++ b/tests/Unit/Component/Router/FriendlyUrl/FriendlyUrlUniqueResultFactoryTest.php
@@ -13,6 +13,7 @@
 use Shopsys\FrameworkBundle\Component\Router\FriendlyUrl\FriendlyUrlFactory;
 use Shopsys\FrameworkBundle\Component\Router\FriendlyUrl\FriendlyUrlUniqueResultFactory;
 use Shopsys\FrameworkBundle\Component\Setting\Setting;
+use Shopsys\FrameworkBundle\Model\Administrator\AdministratorFacade;
 
 class FriendlyUrlUniqueResultFactoryTest extends TestCase
 {
@@ -31,7 +32,8 @@ private function getDomainConfigs(): array
     public function testCreateNewUnique(): void
     {
         $settingMock = $this->createMock(Setting::class);
-        $domain = new Domain($this->getDomainConfigs(), $settingMock);
+        $administratorFacadeMock = $this->createMock(AdministratorFacade::class);
+        $domain = new Domain($this->getDomainConfigs(), $settingMock, $administratorFacadeMock);
 
         $friendlyUrlUniqueResultFactory = new FriendlyUrlUniqueResultFactory(
             new FriendlyUrlFactory($domain, new EntityNameResolver([])),
@@ -54,7 +56,8 @@ public function testCreateNewUnique(): void
     public function testCreateOldUnique(): void
     {
         $settingMock = $this->createMock(Setting::class);
-        $domain = new Domain($this->getDomainConfigs(), $settingMock);
+        $administratorFacadeMock = $this->createMock(AdministratorFacade::class);
+        $domain = new Domain($this->getDomainConfigs(), $settingMock, $administratorFacadeMock);
 
         $friendlyUrlUniqueResultFactory = new FriendlyUrlUniqueResultFactory(
             new FriendlyUrlFactory($domain, new EntityNameResolver([])),
@@ -80,7 +83,8 @@ public function testCreateOldUnique(): void
     public function testCreateNotUnique(): void
     {
         $settingMock = $this->createMock(Setting::class);
-        $domain = new Domain($this->getDomainConfigs(), $settingMock);
+        $administratorFacadeMock = $this->createMock(AdministratorFacade::class);
+        $domain = new Domain($this->getDomainConfigs(), $settingMock, $administratorFacadeMock);
 
         $friendlyUrlUniqueResultFactory = new FriendlyUrlUniqueResultFactory(
             new FriendlyUrlFactory($domain, new EntityNameResolver([])),
diff --git a/tests/Unit/Form/DateTimeTypeTest.php b/tests/Unit/Form/DateTimeTypeTest.php
index d51587414f..bc21a88e71 100644
--- a/tests/Unit/Form/DateTimeTypeTest.php
+++ b/tests/Unit/Form/DateTimeTypeTest.php
@@ -12,6 +12,7 @@
 use Shopsys\FrameworkBundle\Component\Localization\DisplayTimeZoneProvider;
 use Shopsys\FrameworkBundle\Component\Setting\Setting;
 use Shopsys\FrameworkBundle\Form\DateTimeType;
+use Shopsys\FrameworkBundle\Model\Administrator\AdministratorFacade;
 use Symfony\Component\Form\PreloadedExtension;
 use Symfony\Component\Form\Test\TypeTestCase;
 
@@ -74,7 +75,8 @@ private function getMockedDomain(string $dateTimeZoneString): Domain
             ->getMock();
         $dateTimeZone = new DateTimeZone($dateTimeZoneString);
         $domainConfig = new DomainConfig(1, 'http://example.com', 'name', 'en', $dateTimeZone);
+        $administratorFacadeMock = $this->createMock(AdministratorFacade::class);
 
-        return new Domain([$domainConfig], $settingMock);
+        return new Domain([$domainConfig], $settingMock, $administratorFacadeMock);
     }
 }
diff --git a/tests/Unit/Model/Feed/FeedCronModuleTest.php b/tests/Unit/Model/Feed/FeedCronModuleTest.php
index 52742707c0..6d227b1565 100644
--- a/tests/Unit/Model/Feed/FeedCronModuleTest.php
+++ b/tests/Unit/Model/Feed/FeedCronModuleTest.php
@@ -9,6 +9,7 @@
 use Shopsys\FrameworkBundle\Component\Domain\Config\DomainConfig;
 use Shopsys\FrameworkBundle\Component\Domain\Domain;
 use Shopsys\FrameworkBundle\Component\Setting\Setting;
+use Shopsys\FrameworkBundle\Model\Administrator\AdministratorFacade;
 use Shopsys\FrameworkBundle\Model\Feed\FeedCronModule;
 use Shopsys\FrameworkBundle\Model\Feed\FeedExport;
 use Shopsys\FrameworkBundle\Model\Feed\FeedFacade;
@@ -42,7 +43,8 @@ public function testSleepExactBetweenFeeds(): void
 
         $defaultTimeZone = new DateTimeZone('Europe/Prague');
         $domainConfig = new DomainConfig(1, 'http://example.com', 'name', 'en', $defaultTimeZone);
-        $domain = new Domain([$domainConfig], $settingMock);
+        $administratorFacadeMock = $this->createMock(AdministratorFacade::class);
+        $domain = new Domain([$domainConfig], $settingMock, $administratorFacadeMock);
 
         $feedExportMock = $this->getMockBuilder(FeedExport::class)
             ->disableOriginalConstructor()
diff --git a/tests/Unit/Model/Order/OrderFacadeHeurekaTest.php b/tests/Unit/Model/Order/OrderFacadeHeurekaTest.php
index 683bcd7835..b66df99546 100644
--- a/tests/Unit/Model/Order/OrderFacadeHeurekaTest.php
+++ b/tests/Unit/Model/Order/OrderFacadeHeurekaTest.php
@@ -11,6 +11,7 @@
 use Shopsys\FrameworkBundle\Component\Domain\Config\DomainConfig;
 use Shopsys\FrameworkBundle\Component\Domain\Domain;
 use Shopsys\FrameworkBundle\Component\Setting\Setting;
+use Shopsys\FrameworkBundle\Model\Administrator\AdministratorFacade;
 use Shopsys\FrameworkBundle\Model\Administrator\Security\AdministratorFrontSecurityFacade;
 use Shopsys\FrameworkBundle\Model\Cart\CartFacade;
 use Shopsys\FrameworkBundle\Model\Customer\User\CurrentCustomerUser;
@@ -144,8 +145,9 @@ private function createDomain(): Domain
     {
         $defaultTimeZone = new DateTimeZone('Europe/Prague');
         $domainConfig = new DomainConfig(Domain::FIRST_DOMAIN_ID, '', '', 'cs', $defaultTimeZone);
+        $administratorFacadeMock = $this->createMock(AdministratorFacade::class);
 
-        return new Domain([$domainConfig], $this->createMock(Setting::class));
+        return new Domain([$domainConfig], $this->createMock(Setting::class), $administratorFacadeMock);
     }
 
     /**
diff --git a/tests/Unit/Twig/DateTimeFormatterExtensionTest.php b/tests/Unit/Twig/DateTimeFormatterExtensionTest.php
index 34530e1e85..db6c2388ee 100644
--- a/tests/Unit/Twig/DateTimeFormatterExtensionTest.php
+++ b/tests/Unit/Twig/DateTimeFormatterExtensionTest.php
@@ -14,6 +14,7 @@
 use Shopsys\FrameworkBundle\Component\Localization\DateTimeFormatter;
 use Shopsys\FrameworkBundle\Component\Localization\DisplayTimeZoneProvider;
 use Shopsys\FrameworkBundle\Component\Setting\Setting;
+use Shopsys\FrameworkBundle\Model\Administrator\AdministratorFacade;
 use Shopsys\FrameworkBundle\Model\Localization\Localization;
 use Shopsys\FrameworkBundle\Twig\DateTimeFormatterExtension;
 
@@ -89,7 +90,8 @@ private function getMockedDomain(): Domain
             ->getMock();
         $dateTimeZone = new DateTimeZone(self::DISPLAY_TIME_ZONE);
         $domainConfig = new DomainConfig(1, 'http://example.com', 'name', 'en', $dateTimeZone);
+        $administratorFacadeMock = $this->createMock(AdministratorFacade::class);
 
-        return new Domain([$domainConfig], $settingMock);
+        return new Domain([$domainConfig], $settingMock, $administratorFacadeMock);
     }
 }

From 2dc1edd82a8a35e24d9b12a347966c9a2350594c Mon Sep 17 00:00:00 2001
From: Martin Grossmann <martin@vyvoj.net>
Date: Tue, 16 Jul 2024 11:03:08 +0200
Subject: [PATCH 05/32] localized types now take into account the filtered edit
 domains

---
 src/Form/Locale/LocalizedType.php       |  2 +-
 src/Model/Localization/Localization.php | 20 ++++++++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/Form/Locale/LocalizedType.php b/src/Form/Locale/LocalizedType.php
index b5171fd235..67a45385ea 100644
--- a/src/Form/Locale/LocalizedType.php
+++ b/src/Form/Locale/LocalizedType.php
@@ -40,7 +40,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $defaultLocaleOptions['required'] = $options['required'];
         $otherLocaleOptions['required'] = $options['required'] && $otherLocaleOptions['required'];
 
-        foreach ($this->localization->getLocalesOfAllDomains() as $locale) {
+        foreach ($this->localization->getAdminEnabledLocales() as $locale) {
             if ($locale === $this->localization->getAdminLocale()) {
                 $builder->add(
                     $locale,
diff --git a/src/Model/Localization/Localization.php b/src/Model/Localization/Localization.php
index a10062fe5a..e607f0085b 100644
--- a/src/Model/Localization/Localization.php
+++ b/src/Model/Localization/Localization.php
@@ -19,8 +19,10 @@ class Localization
      * @param \Shopsys\FrameworkBundle\Component\Domain\Domain $domain
      * @param string $adminLocale
      */
-    public function __construct(protected readonly Domain $domain, protected readonly string $adminLocale)
-    {
+    public function __construct(
+        protected readonly Domain $domain,
+        protected readonly string $adminLocale,
+    ) {
     }
 
     /**
@@ -74,4 +76,18 @@ public function getCollationByLocale(string $locale): string
     {
         return $locale . '-x-icu';
     }
+
+    /**
+     * @return string[]
+     */
+    public function getAdminEnabledLocales(): array
+    {
+        $enabledLocales = [];
+
+        foreach ($this->domain->getAdminEnabledDomains() as $domainConfig) {
+            $enabledLocales[] = $domainConfig->getLocale();
+        }
+
+        return $enabledLocales;
+    }
 }

From 4cf2a0327eaa9fcf8c750eccb63cb64c962e46f3 Mon Sep 17 00:00:00 2001
From: Martin Grossmann <martin@vyvoj.net>
Date: Tue, 3 Sep 2024 22:16:01 +0200
Subject: [PATCH 06/32] product edit form now take into account selected
 domains

---
 src/Controller/Admin/ProductController.php            |  2 +-
 src/Form/Admin/Product/ProductFormType.php            | 11 ++++-------
 .../Product/Pricing/ProductManualInputPriceFacade.php |  4 ++++
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/Controller/Admin/ProductController.php b/src/Controller/Admin/ProductController.php
index f91f34de74..99ff043c57 100644
--- a/src/Controller/Admin/ProductController.php
+++ b/src/Controller/Admin/ProductController.php
@@ -355,7 +355,7 @@ public function visibilityAction($productId)
 
         return $this->render('@ShopsysFramework/Admin/Content/Product/visibility.html.twig', [
             'product' => $product,
-            'domains' => $this->domain->getAll(),
+            'domains' => $this->domain->getAdminEnabledDomains(),
         ]);
     }
 
diff --git a/src/Form/Admin/Product/ProductFormType.php b/src/Form/Admin/Product/ProductFormType.php
index 134e33261c..c13bbaf29b 100644
--- a/src/Form/Admin/Product/ProductFormType.php
+++ b/src/Form/Admin/Product/ProductFormType.php
@@ -358,9 +358,7 @@ private function createDisplayAvailabilityGroup(
 
         $mainCategoriesOptionsByDomainId = [];
 
-        foreach ($this->domain->getAll() as $domainConfig) {
-            $domainId = $domainConfig->getId();
-
+        foreach ($this->domain->getAdminEnabledDomainIds() as $domainId) {
             if (count($productMainCategoriesIndexedByDomainId) <= 0) {
                 continue;
             }
@@ -382,7 +380,7 @@ private function createDisplayAvailabilityGroup(
 
         $categoriesOptionsByDomainId = [];
 
-        foreach ($this->domain->getAllIds() as $domainId) {
+        foreach ($this->domain->getAdminEnabledDomainIds() as $domainId) {
             $categoriesOptionsByDomainId[$domainId] = [
                 'domain_id' => $domainId,
             ];
@@ -591,9 +589,8 @@ private function createSeoGroup(FormBuilderInterface $builder, ?Product $product
         $seoMetaDescriptionsOptionsByDomainId = [];
         $seoH1OptionsByDomainId = [];
 
-        foreach ($this->domain->getAll() as $domainConfig) {
-            $domainId = $domainConfig->getId();
-            $locale = $domainConfig->getLocale();
+        foreach ($this->domain->getAdminEnabledDomainIds() as $domainId) {
+            $locale = $this->domain->getDomainConfigById($domainId)->getLocale();
 
             $seoTitlesOptionsByDomainId[$domainId] = [
                 'attr' => [
diff --git a/src/Model/Product/Pricing/ProductManualInputPriceFacade.php b/src/Model/Product/Pricing/ProductManualInputPriceFacade.php
index 9c1c074e2b..7c2f629648 100644
--- a/src/Model/Product/Pricing/ProductManualInputPriceFacade.php
+++ b/src/Model/Product/Pricing/ProductManualInputPriceFacade.php
@@ -53,6 +53,10 @@ protected function refresh(Product $product, PricingGroup $pricingGroup, ?Money
     public function refreshProductManualInputPrices(Product $product, array $productInputPriceDataByDomain): void
     {
         foreach ($this->pricingGroupRepository->getAll() as $pricingGroup) {
+            if (!array_key_exists($pricingGroup->getId(), $productInputPriceDataByDomain[$pricingGroup->getDomainId()]->manualInputPricesByPricingGroupId)) {
+                continue;
+            }
+
             $this->refresh(
                 $product,
                 $pricingGroup,

From f54ae77459dad381eb85937462294d7f1361cba1 Mon Sep 17 00:00:00 2001
From: Martin Grossmann <martin@vyvoj.net>
Date: Tue, 3 Sep 2024 22:24:44 +0200
Subject: [PATCH 07/32] domain tabs are now limited by selected domains

---
 .../Domain/AdminDomainFilterTabsFacade.php        |  8 ++++++--
 src/Component/Domain/AdminDomainTabsFacade.php    | 15 +++++++++++----
 src/Controller/Admin/DomainController.php         |  4 ++--
 src/Controller/Admin/DomainFilterController.php   |  2 +-
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/Component/Domain/AdminDomainFilterTabsFacade.php b/src/Component/Domain/AdminDomainFilterTabsFacade.php
index a70a730ecb..3fecfa6d87 100644
--- a/src/Component/Domain/AdminDomainFilterTabsFacade.php
+++ b/src/Component/Domain/AdminDomainFilterTabsFacade.php
@@ -11,7 +11,7 @@
 
 class AdminDomainFilterTabsFacade
 {
-    protected const SESSION_PREFIX = 'admin_domain_filter_tabs_';
+    protected const string SESSION_PREFIX = 'admin_domain_filter_tabs_';
 
     /**
      * @param \Symfony\Component\HttpFoundation\RequestStack $requestStack
@@ -54,9 +54,13 @@ public function getSelectedDomainConfig(string $namespace): ?DomainConfig
                 return null;
             }
 
+            if (!in_array($domainId, $this->domain->getAdminEnabledDomainIds(), true)) {
+                throw new InvalidDomainIdException();
+            }
+
             return $this->domain->getDomainConfigById($domainId);
         } catch (InvalidDomainIdException|SessionNotFoundException) {
-            $this->requestStack->getSession()->set($this->getSessionKey($namespace), null);
+            $this->setSelectedDomainId($namespace, null);
 
             return null;
         }
diff --git a/src/Component/Domain/AdminDomainTabsFacade.php b/src/Component/Domain/AdminDomainTabsFacade.php
index ea7cacc2f2..6632a649b9 100644
--- a/src/Component/Domain/AdminDomainTabsFacade.php
+++ b/src/Component/Domain/AdminDomainTabsFacade.php
@@ -11,7 +11,7 @@
 
 class AdminDomainTabsFacade
 {
-    protected const SESSION_SELECTED_DOMAIN = 'selected_domain_id';
+    protected const string SESSION_SELECTED_DOMAIN = 'selected_domain_id';
 
     /**
      * @param \Shopsys\FrameworkBundle\Component\Domain\Domain $domain
@@ -48,11 +48,18 @@ public function getSelectedDomainConfig(): DomainConfig
         try {
             $domainId = $this->requestStack->getSession()->get(static::SESSION_SELECTED_DOMAIN);
 
+            if (!in_array($domainId, $this->domain->getAdminEnabledDomainIds(), true)) {
+                throw new InvalidDomainIdException();
+            }
+
             return $this->domain->getDomainConfigById($domainId);
-        } catch (InvalidDomainIdException | SessionNotFoundException) {
-            $allDomains = $this->domain->getAll();
+        } catch (InvalidDomainIdException|SessionNotFoundException) {
+            $allowedDomainIds = $this->domain->getAdminEnabledDomainIds();
+            $firstAllowedDomainId = reset($allowedDomainIds);
+
+            $this->setSelectedDomainId($firstAllowedDomainId);
 
-            return reset($allDomains);
+            return $this->domain->getDomainConfigById($firstAllowedDomainId);
         }
     }
 }
diff --git a/src/Controller/Admin/DomainController.php b/src/Controller/Admin/DomainController.php
index 984720876f..8153d0988e 100644
--- a/src/Controller/Admin/DomainController.php
+++ b/src/Controller/Admin/DomainController.php
@@ -39,7 +39,7 @@ public function __construct(
     public function domainTabsAction()
     {
         return $this->render('@ShopsysFramework/Admin/Inline/Domain/tabs.html.twig', [
-            'domainConfigs' => $this->domain->getAll(),
+            'domainConfigs' => $this->domain->getAdminEnabledDomains(),
             'selectedDomainId' => $this->adminDomainTabsFacade->getSelectedDomainId(),
         ]);
     }
@@ -142,7 +142,7 @@ public function localeTabsAction(): Response
     {
         $domainConfigs = [];
 
-        foreach ($this->domain->getAll() as $domainConfig) {
+        foreach ($this->domain->getAdminEnabledDomains() as $domainConfig) {
             if (!isset($domainConfigs[$domainConfig->getLocale()])) {
                 $domainConfigs[$domainConfig->getLocale()] = $domainConfig;
             }
diff --git a/src/Controller/Admin/DomainFilterController.php b/src/Controller/Admin/DomainFilterController.php
index 406aca674a..c84210839b 100644
--- a/src/Controller/Admin/DomainFilterController.php
+++ b/src/Controller/Admin/DomainFilterController.php
@@ -30,7 +30,7 @@ public function __construct(
     public function domainFilterTabsAction(string $namespace): Response
     {
         return $this->render('@ShopsysFramework/Admin/Inline/Domain/filter.html.twig', [
-            'domainConfigs' => $this->domain->getAll(),
+            'domainConfigs' => $this->domain->getAdminEnabledDomains(),
             'namespace' => $namespace,
             'selectedDomainId' => $this->adminDomainFilterTabsFacade->getSelectedDomainId($namespace),
         ]);

From 02d04e8c2012654020ce3d0c6f2ce954af3ab688 Mon Sep 17 00:00:00 2001
From: Martin Grossmann <martin@vyvoj.net>
Date: Mon, 29 Jul 2024 22:20:35 +0200
Subject: [PATCH 08/32] removed dependency to adminDomainTabsFacade from
 articleFacade

- adminDomainTabsFacade have to be used in classes related to admin frontend
using in the factory prevents creating the objects programatically (import, command, ...)
---
 src/Controller/Admin/ArticleController.php        |  5 +++--
 src/Model/Article/ArticleDataFactory.php          | 13 ++++++-------
 src/Model/Article/ArticleDataFactoryInterface.php |  3 ++-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/Controller/Admin/ArticleController.php b/src/Controller/Admin/ArticleController.php
index 3e0408bd3d..bb689e3a9c 100644
--- a/src/Controller/Admin/ArticleController.php
+++ b/src/Controller/Admin/ArticleController.php
@@ -120,11 +120,12 @@ public function listAction(): Response
     #[Route(path: '/article/new/')]
     public function newAction(Request $request): Response
     {
-        $articleData = $this->articleDataFactory->create();
+        $selectedDomainId = $this->adminDomainTabsFacade->getSelectedDomainId();
+        $articleData = $this->articleDataFactory->create($selectedDomainId);
 
         $form = $this->createForm(ArticleFormType::class, $articleData, [
             'article' => null,
-            'domain_id' => $this->adminDomainTabsFacade->getSelectedDomainId(),
+            'domain_id' => $selectedDomainId,
         ]);
         $form->handleRequest($request);
 
diff --git a/src/Model/Article/ArticleDataFactory.php b/src/Model/Article/ArticleDataFactory.php
index c415a393eb..421d1416d8 100644
--- a/src/Model/Article/ArticleDataFactory.php
+++ b/src/Model/Article/ArticleDataFactory.php
@@ -4,7 +4,6 @@
 
 namespace Shopsys\FrameworkBundle\Model\Article;
 
-use Shopsys\FrameworkBundle\Component\Domain\AdminDomainTabsFacade;
 use Shopsys\FrameworkBundle\Component\Domain\Domain;
 use Shopsys\FrameworkBundle\Component\Router\FriendlyUrl\FriendlyUrlFacade;
 
@@ -13,12 +12,10 @@ class ArticleDataFactory implements ArticleDataFactoryInterface
     /**
      * @param \Shopsys\FrameworkBundle\Component\Router\FriendlyUrl\FriendlyUrlFacade $friendlyUrlFacade
      * @param \Shopsys\FrameworkBundle\Component\Domain\Domain $domain
-     * @param \Shopsys\FrameworkBundle\Component\Domain\AdminDomainTabsFacade $adminDomainTabsFacade
      */
     public function __construct(
         protected readonly FriendlyUrlFacade $friendlyUrlFacade,
         protected readonly Domain $domain,
-        protected readonly AdminDomainTabsFacade $adminDomainTabsFacade,
     ) {
     }
 
@@ -43,12 +40,13 @@ public function createFromArticle(Article $article): ArticleData
     }
 
     /**
+     * @param int $domainId
      * @return \Shopsys\FrameworkBundle\Model\Article\ArticleData
      */
-    public function create(): ArticleData
+    public function create(int $domainId): ArticleData
     {
         $articleData = $this->createInstance();
-        $this->fillNew($articleData);
+        $this->fillNew($articleData, $domainId);
 
         return $articleData;
     }
@@ -84,9 +82,10 @@ protected function fillFromArticle(ArticleData $articleData, Article $article)
 
     /**
      * @param \Shopsys\FrameworkBundle\Model\Article\ArticleData $articleData
+     * @param int $domainId
      */
-    protected function fillNew(ArticleData $articleData)
+    protected function fillNew(ArticleData $articleData, int $domainId)
     {
-        $articleData->domainId = $this->adminDomainTabsFacade->getSelectedDomainId();
+        $articleData->domainId = $domainId;
     }
 }
diff --git a/src/Model/Article/ArticleDataFactoryInterface.php b/src/Model/Article/ArticleDataFactoryInterface.php
index 4648fc8976..ea13b0528a 100644
--- a/src/Model/Article/ArticleDataFactoryInterface.php
+++ b/src/Model/Article/ArticleDataFactoryInterface.php
@@ -7,9 +7,10 @@
 interface ArticleDataFactoryInterface
 {
     /**
+     * @param int $domainId
      * @return \Shopsys\FrameworkBundle\Model\Article\ArticleData
      */
-    public function create(): ArticleData;
+    public function create(int $domainId): ArticleData;
 
     /**
      * @param \Shopsys\FrameworkBundle\Model\Article\Article $article

From 4279f24b4a65c1fa51316d7f94f340509679424b Mon Sep 17 00:00:00 2001
From: Martin Grossmann <martin@vyvoj.net>
Date: Tue, 13 Aug 2024 23:20:05 +0200
Subject: [PATCH 09/32] removed dependency to adminDomainTabsFacade from
 pricingGroupFacade

---
 .../Admin/PricingGroupController.php          |  9 ++++---
 .../Pricing/Group/PricingGroupFacade.php      | 14 +++++++---
 .../Group/PricingGroupSettingFacade.php       | 26 ++++++++++---------
 3 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/src/Controller/Admin/PricingGroupController.php b/src/Controller/Admin/PricingGroupController.php
index efab9e1421..8dfbb777b6 100644
--- a/src/Controller/Admin/PricingGroupController.php
+++ b/src/Controller/Admin/PricingGroupController.php
@@ -94,14 +94,16 @@ public function deleteConfirmAction($id)
         try {
             $pricingGroup = $this->pricingGroupFacade->getById($id);
 
-            if ($this->pricingGroupSettingFacade->isPricingGroupUsedOnSelectedDomain($pricingGroup)) {
+            $selectedDomain = $this->adminDomainTabsFacade->getSelectedDomainConfig();
+
+            if ($this->pricingGroupSettingFacade->isPricingGroupUsedOnDomain($pricingGroup, $selectedDomain)) {
                 $message = t(
                     'For removing pricing group "%name%" you have to choose other one to be set everywhere where the existing one is used. '
                     . 'Which pricing group you want to set instead?',
                     ['%name%' => $pricingGroup->getName()],
                 );
 
-                if ($this->pricingGroupSettingFacade->isPricingGroupDefaultOnSelectedDomain($pricingGroup)) {
+                if ($this->pricingGroupSettingFacade->isPricingGroupDefaultOnDomain($pricingGroup, $selectedDomain)) {
                     $message = t(
                         'Pricing group "%name%" set as default. For deleting it you have to choose other one to be set everywhere '
                         . 'where the existing one is used. Which pricing group you want to set instead?',
@@ -149,8 +151,9 @@ public function settingsAction(Request $request)
         if ($form->isSubmitted() && $form->isValid()) {
             $pricingGroupSettingsFormData = $form->getData();
 
-            $this->pricingGroupSettingFacade->setDefaultPricingGroupForSelectedDomain(
+            $this->pricingGroupSettingFacade->setDefaultPricingGroupForDomain(
                 $pricingGroupSettingsFormData['defaultPricingGroup'],
+                $this->adminDomainTabsFacade->getSelectedDomainConfig(),
             );
 
             $this->addSuccessFlash(t('Default pricing group settings modified'));
diff --git a/src/Model/Pricing/Group/PricingGroupFacade.php b/src/Model/Pricing/Group/PricingGroupFacade.php
index 72e61a4de3..9ffe5d8deb 100644
--- a/src/Model/Pricing/Group/PricingGroupFacade.php
+++ b/src/Model/Pricing/Group/PricingGroupFacade.php
@@ -5,6 +5,7 @@
 namespace Shopsys\FrameworkBundle\Model\Pricing\Group;
 
 use Doctrine\ORM\EntityManagerInterface;
+use Shopsys\FrameworkBundle\Component\Domain\Config\DomainConfig;
 use Shopsys\FrameworkBundle\Model\Customer\User\CustomerUserRepository;
 use Shopsys\FrameworkBundle\Model\Product\ProductVisibilityFacade;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -82,9 +83,13 @@ public function edit($pricingGroupId, PricingGroupData $pricingGroupData)
     /**
      * @param int $oldPricingGroupId
      * @param int|null $newPricingGroupId
+     * @param \Shopsys\FrameworkBundle\Component\Domain\Config\DomainConfig|null $selectedDomain
      */
-    public function delete($oldPricingGroupId, $newPricingGroupId = null)
-    {
+    public function delete(
+        int $oldPricingGroupId,
+        ?int $newPricingGroupId = null,
+        ?DomainConfig $selectedDomain = null,
+    ): void {
         $oldPricingGroup = $this->pricingGroupRepository->getById($oldPricingGroupId);
 
         if ($newPricingGroupId !== null) {
@@ -96,9 +101,10 @@ public function delete($oldPricingGroupId, $newPricingGroupId = null)
 
         if (
             $newPricingGroup !== null
-            && $this->pricingGroupSettingFacade->isPricingGroupDefaultOnSelectedDomain($oldPricingGroup)
+            && $selectedDomain !== null
+            && $this->pricingGroupSettingFacade->isPricingGroupDefaultOnDomain($oldPricingGroup, $selectedDomain)
         ) {
-            $this->pricingGroupSettingFacade->setDefaultPricingGroupForSelectedDomain($newPricingGroup);
+            $this->pricingGroupSettingFacade->setDefaultPricingGroupForDomain($newPricingGroup, $selectedDomain);
         }
 
         $this->em->remove($oldPricingGroup);
diff --git a/src/Model/Pricing/Group/PricingGroupSettingFacade.php b/src/Model/Pricing/Group/PricingGroupSettingFacade.php
index b76bf83b1e..099c044365 100644
--- a/src/Model/Pricing/Group/PricingGroupSettingFacade.php
+++ b/src/Model/Pricing/Group/PricingGroupSettingFacade.php
@@ -4,7 +4,7 @@
 
 namespace Shopsys\FrameworkBundle\Model\Pricing\Group;
 
-use Shopsys\FrameworkBundle\Component\Domain\AdminDomainTabsFacade;
+use Shopsys\FrameworkBundle\Component\Domain\Config\DomainConfig;
 use Shopsys\FrameworkBundle\Component\Domain\Domain;
 use Shopsys\FrameworkBundle\Component\Setting\Setting;
 
@@ -13,25 +13,24 @@ class PricingGroupSettingFacade
     /**
      * @param \Shopsys\FrameworkBundle\Model\Pricing\Group\PricingGroupRepository $pricingGroupRepository
      * @param \Shopsys\FrameworkBundle\Component\Domain\Domain $domain
-     * @param \Shopsys\FrameworkBundle\Component\Domain\AdminDomainTabsFacade $adminDomainTabsFacade
      * @param \Shopsys\FrameworkBundle\Component\Setting\Setting $setting
      */
     public function __construct(
         protected readonly PricingGroupRepository $pricingGroupRepository,
         protected readonly Domain $domain,
-        protected readonly AdminDomainTabsFacade $adminDomainTabsFacade,
         protected readonly Setting $setting,
     ) {
     }
 
     /**
      * @param \Shopsys\FrameworkBundle\Model\Pricing\Group\PricingGroup $pricingGroup
+     * @param \Shopsys\FrameworkBundle\Component\Domain\Config\DomainConfig $domainConfig
      * @return bool
      */
-    public function isPricingGroupUsedOnSelectedDomain(PricingGroup $pricingGroup)
+    public function isPricingGroupUsedOnDomain(PricingGroup $pricingGroup, DomainConfig $domainConfig): bool
     {
         return $this->pricingGroupRepository->existsCustomerUserWithPricingGroup($pricingGroup)
-            || $this->isPricingGroupDefaultOnSelectedDomain($pricingGroup);
+            || $this->isPricingGroupDefaultOnDomain($pricingGroup, $domainConfig);
     }
 
     /**
@@ -62,37 +61,40 @@ public function getAllDefaultPricingGroupsIdsIndexedByDomainId(): array
     /**
      * @return \Shopsys\FrameworkBundle\Model\Pricing\Group\PricingGroup
      */
-    public function getDefaultPricingGroupByCurrentDomain()
+    public function getDefaultPricingGroupByCurrentDomain(): PricingGroup
     {
         return $this->getDefaultPricingGroupByDomainId($this->domain->getId());
     }
 
     /**
+     * @param \Shopsys\FrameworkBundle\Component\Domain\Config\DomainConfig $domainConfig
      * @return \Shopsys\FrameworkBundle\Model\Pricing\Group\PricingGroup
      */
-    public function getDefaultPricingGroupBySelectedDomain()
+    public function getDefaultPricingGroupByDomain(DomainConfig $domainConfig): PricingGroup
     {
-        return $this->getDefaultPricingGroupByDomainId($this->adminDomainTabsFacade->getSelectedDomainId());
+        return $this->getDefaultPricingGroupByDomainId($domainConfig->getId());
     }
 
     /**
      * @param \Shopsys\FrameworkBundle\Model\Pricing\Group\PricingGroup $pricingGroup
+     * @param \Shopsys\FrameworkBundle\Component\Domain\Config\DomainConfig $domainConfig
      */
-    public function setDefaultPricingGroupForSelectedDomain(PricingGroup $pricingGroup)
+    public function setDefaultPricingGroupForDomain(PricingGroup $pricingGroup, DomainConfig $domainConfig): void
     {
         $this->setting->setForDomain(
             Setting::DEFAULT_PRICING_GROUP,
             $pricingGroup->getId(),
-            $this->adminDomainTabsFacade->getSelectedDomainId(),
+            $domainConfig->getId(),
         );
     }
 
     /**
      * @param \Shopsys\FrameworkBundle\Model\Pricing\Group\PricingGroup $pricingGroup
+     * @param \Shopsys\FrameworkBundle\Component\Domain\Config\DomainConfig $domainConfig
      * @return bool
      */
-    public function isPricingGroupDefaultOnSelectedDomain(PricingGroup $pricingGroup)
+    public function isPricingGroupDefaultOnDomain(PricingGroup $pricingGroup, DomainConfig $domainConfig): bool
     {
-        return $pricingGroup === $this->getDefaultPricingGroupBySelectedDomain();
+        return $pricingGroup === $this->getDefaultPricingGroupByDomain($domainConfig);
     }
 }

From 40e852d05090428121a97dc472fa05a5012bb601 Mon Sep 17 00:00:00 2001
From: Martin Grossmann <martin@vyvoj.net>
Date: Tue, 13 Aug 2024 23:33:11 +0200
Subject: [PATCH 10/32] removed dependency to adminDomainTabsFacade from
 StockSettingsDataFacade

---
 src/Controller/Admin/StockController.php    | 5 ++++-
 src/Model/Stock/StockSettingsDataFacade.php | 9 ++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Controller/Admin/StockController.php b/src/Controller/Admin/StockController.php
index d06a2a67ed..9ce012e86e 100644
--- a/src/Controller/Admin/StockController.php
+++ b/src/Controller/Admin/StockController.php
@@ -98,7 +98,10 @@ public function saveSettingsAction(Request $request): RedirectResponse
         if ($form->isSubmitted() && $form->isValid()) {
             $stockSettingsData = $form->getData();
 
-            $this->stockSettingsDataFacade->edit($stockSettingsData);
+            $this->stockSettingsDataFacade->edit(
+                $stockSettingsData,
+                $this->adminDomainTabsFacade->getSelectedDomainConfig(),
+            );
 
             $this
                 ->addSuccessFlashTwig(
diff --git a/src/Model/Stock/StockSettingsDataFacade.php b/src/Model/Stock/StockSettingsDataFacade.php
index 68bb6572bc..a7e724f240 100644
--- a/src/Model/Stock/StockSettingsDataFacade.php
+++ b/src/Model/Stock/StockSettingsDataFacade.php
@@ -4,7 +4,7 @@
 
 namespace Shopsys\FrameworkBundle\Model\Stock;
 
-use Shopsys\FrameworkBundle\Component\Domain\AdminDomainTabsFacade;
+use Shopsys\FrameworkBundle\Component\Domain\Config\DomainConfig;
 use Shopsys\FrameworkBundle\Component\Setting\Setting;
 use Shopsys\FrameworkBundle\Model\Product\Elasticsearch\Scope\ProductExportScopeConfig;
 use Shopsys\FrameworkBundle\Model\Product\Recalculation\ProductRecalculationDispatcher;
@@ -13,25 +13,24 @@ class StockSettingsDataFacade
 {
     /**
      * @param \Shopsys\FrameworkBundle\Component\Setting\Setting $setting
-     * @param \Shopsys\FrameworkBundle\Component\Domain\AdminDomainTabsFacade $adminDomainTabsFacade
      * @param \Shopsys\FrameworkBundle\Model\Product\Recalculation\ProductRecalculationDispatcher $productRecalculationDispatcher
      */
     public function __construct(
         protected readonly Setting $setting,
-        protected readonly AdminDomainTabsFacade $adminDomainTabsFacade,
         protected readonly ProductRecalculationDispatcher $productRecalculationDispatcher,
     ) {
     }
 
     /**
      * @param \Shopsys\FrameworkBundle\Model\Stock\StockSettingsData $stockSettingsData
+     * @param \Shopsys\FrameworkBundle\Component\Domain\Config\DomainConfig $domainConfig
      */
-    public function edit(StockSettingsData $stockSettingsData): void
+    public function edit(StockSettingsData $stockSettingsData, DomainConfig $domainConfig): void
     {
         $this->setting->setForDomain(
             Setting::TRANSFER_DAYS_BETWEEN_STOCKS,
             (int)$stockSettingsData->transfer,
-            $this->adminDomainTabsFacade->getSelectedDomainId(),
+            $domainConfig->getId(),
         );
 
         $this->productRecalculationDispatcher->dispatchAllProducts([ProductExportScopeConfig::SCOPE_STOCKS]);

From 6d73c95925af78e4191da8710d99ed45f353fde2 Mon Sep 17 00:00:00 2001
From: Martin Grossmann <martin@vyvoj.net>
Date: Wed, 14 Aug 2024 12:27:08 +0200
Subject: [PATCH 11/32] improved creating stock data

---
 src/Model/Stock/StockDataFactory.php | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/Model/Stock/StockDataFactory.php b/src/Model/Stock/StockDataFactory.php
index dac0436d1c..55319b7296 100644
--- a/src/Model/Stock/StockDataFactory.php
+++ b/src/Model/Stock/StockDataFactory.php
@@ -19,18 +19,29 @@ public function __construct(
     /**
      * @return \Shopsys\FrameworkBundle\Model\Stock\StockData
      */
-    public function create(): StockData
+    protected function createInstance(): StockData
     {
         return new StockData();
     }
 
+    /**
+     * @return \Shopsys\FrameworkBundle\Model\Stock\StockData
+     */
+    public function create(): StockData
+    {
+        $stockData = $this->createInstance();
+        $this->fillNew($stockData);
+
+        return $stockData;
+    }
+
     /**
      * @param \Shopsys\FrameworkBundle\Model\Stock\Stock $stock
      * @return \Shopsys\FrameworkBundle\Model\Stock\StockData
      */
     public function createFromStock(Stock $stock): StockData
     {
-        $stockData = new StockData();
+        $stockData = $this->createInstance();
         $this->fillFromStock($stockData, $stock);
 
         return $stockData;
@@ -40,7 +51,7 @@ public function createFromStock(Stock $stock): StockData
      * @param \Shopsys\FrameworkBundle\Model\Stock\StockData $stockData
      * @param \Shopsys\FrameworkBundle\Model\Stock\Stock $stock
      */
-    public function fillFromStock(StockData $stockData, Stock $stock): void
+    protected function fillFromStock(StockData $stockData, Stock $stock): void
     {
         foreach ($this->domain->getAllIds() as $domainId) {
             $stockData->isEnabledByDomain[$domainId] = $stock->isEnabled($domainId);
@@ -51,4 +62,14 @@ public function fillFromStock(StockData $stockData, Stock $stock): void
         $stockData->externalId = $stock->getExternalId();
         $stockData->note = $stock->getNote();
     }
+
+    /**
+     * @param \Shopsys\FrameworkBundle\Model\Stock\StockData $stockData
+     */
+    protected function fillNew(StockData $stockData): void
+    {
+        foreach ($this->domain->getAllIds() as $domainId) {
+            $stockData->isEnabledByDomain[$domainId] = false;
+        }
+    }
 }

From cdb37dadbdb0c672c91a3fbf9b8d6e1c78690dee Mon Sep 17 00:00:00 2001
From: Martin Grossmann <martin@vyvoj.net>
Date: Thu, 22 Aug 2024 21:17:17 +0200
Subject: [PATCH 12/32] removed no longer necessary ArticleDataFactoryInterface

---
 src/Controller/Admin/ArticleController.php    |  6 +++---
 src/Model/Article/ArticleDataFactory.php      |  2 +-
 .../Article/ArticleDataFactoryInterface.php   | 20 -------------------
 src/Resources/config/services.yaml            |  3 ---
 4 files changed, 4 insertions(+), 27 deletions(-)
 delete mode 100644 src/Model/Article/ArticleDataFactoryInterface.php

diff --git a/src/Controller/Admin/ArticleController.php b/src/Controller/Admin/ArticleController.php
index bb689e3a9c..ddb2e055ea 100644
--- a/src/Controller/Admin/ArticleController.php
+++ b/src/Controller/Admin/ArticleController.php
@@ -12,7 +12,7 @@
 use Shopsys\FrameworkBundle\Form\Admin\Article\ArticleFormType;
 use Shopsys\FrameworkBundle\Model\AdminNavigation\BreadcrumbOverrider;
 use Shopsys\FrameworkBundle\Model\Article\Article;
-use Shopsys\FrameworkBundle\Model\Article\ArticleDataFactoryInterface;
+use Shopsys\FrameworkBundle\Model\Article\ArticleDataFactory;
 use Shopsys\FrameworkBundle\Model\Article\ArticleFacade;
 use Shopsys\FrameworkBundle\Model\Article\Exception\ArticleNotFoundException;
 use Shopsys\FrameworkBundle\Model\LegalConditions\LegalConditionsFacade;
@@ -26,7 +26,7 @@ class ArticleController extends AdminBaseController
 {
     /**
      * @param \Shopsys\FrameworkBundle\Model\Article\ArticleFacade $articleFacade
-     * @param \Shopsys\FrameworkBundle\Model\Article\ArticleDataFactoryInterface $articleDataFactory
+     * @param \Shopsys\FrameworkBundle\Model\Article\ArticleDataFactory $articleDataFactory
      * @param \Shopsys\FrameworkBundle\Component\Grid\GridFactory $gridFactory
      * @param \Shopsys\FrameworkBundle\Component\Domain\AdminDomainTabsFacade $adminDomainTabsFacade
      * @param \Shopsys\FrameworkBundle\Model\AdminNavigation\BreadcrumbOverrider $breadcrumbOverrider
@@ -36,7 +36,7 @@ class ArticleController extends AdminBaseController
      */
     public function __construct(
         protected readonly ArticleFacade $articleFacade,
-        protected readonly ArticleDataFactoryInterface $articleDataFactory,
+        protected readonly ArticleDataFactory $articleDataFactory,
         protected readonly GridFactory $gridFactory,
         protected readonly AdminDomainTabsFacade $adminDomainTabsFacade,
         protected readonly BreadcrumbOverrider $breadcrumbOverrider,
diff --git a/src/Model/Article/ArticleDataFactory.php b/src/Model/Article/ArticleDataFactory.php
index 421d1416d8..96dca97197 100644
--- a/src/Model/Article/ArticleDataFactory.php
+++ b/src/Model/Article/ArticleDataFactory.php
@@ -7,7 +7,7 @@
 use Shopsys\FrameworkBundle\Component\Domain\Domain;
 use Shopsys\FrameworkBundle\Component\Router\FriendlyUrl\FriendlyUrlFacade;
 
-class ArticleDataFactory implements ArticleDataFactoryInterface
+class ArticleDataFactory
 {
     /**
      * @param \Shopsys\FrameworkBundle\Component\Router\FriendlyUrl\FriendlyUrlFacade $friendlyUrlFacade
diff --git a/src/Model/Article/ArticleDataFactoryInterface.php b/src/Model/Article/ArticleDataFactoryInterface.php
deleted file mode 100644
index ea13b0528a..0000000000
--- a/src/Model/Article/ArticleDataFactoryInterface.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Shopsys\FrameworkBundle\Model\Article;
-
-interface ArticleDataFactoryInterface
-{
-    /**
-     * @param int $domainId
-     * @return \Shopsys\FrameworkBundle\Model\Article\ArticleData
-     */
-    public function create(int $domainId): ArticleData;
-
-    /**
-     * @param \Shopsys\FrameworkBundle\Model\Article\Article $article
-     * @return \Shopsys\FrameworkBundle\Model\Article\ArticleData
-     */
-    public function createFromArticle(Article $article): ArticleData;
-}
diff --git a/src/Resources/config/services.yaml b/src/Resources/config/services.yaml
index c4f5052f78..c9e7e512f2 100644
--- a/src/Resources/config/services.yaml
+++ b/src/Resources/config/services.yaml
@@ -627,9 +627,6 @@ services:
     Shopsys\FrameworkBundle\Model\Advert\AdvertFactoryInterface:
         alias: Shopsys\FrameworkBundle\Model\Advert\AdvertFactory
 
-    Shopsys\FrameworkBundle\Model\Article\ArticleDataFactoryInterface:
-        alias: Shopsys\FrameworkBundle\Model\Article\ArticleDataFactory
-
     Shopsys\FrameworkBundle\Model\Article\ArticleFactoryInterface:
         alias: Shopsys\FrameworkBundle\Model\Article\ArticleFactory
 

From 8d7154ef92f66ef39b93302559fef9952a2866ac Mon Sep 17 00:00:00 2001
From: Martin Grossmann <martin@vyvoj.net>
Date: Tue, 3 Sep 2024 22:31:34 +0200
Subject: [PATCH 13/32] notification about missing articles are now displayed
 only for managed domains

---
 src/Controller/Admin/DefaultController.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Controller/Admin/DefaultController.php b/src/Controller/Admin/DefaultController.php
index eb7e3dfb91..29d477b154 100644
--- a/src/Controller/Admin/DefaultController.php
+++ b/src/Controller/Admin/DefaultController.php
@@ -416,7 +416,9 @@ protected function checkDefaultUnitIsSet(): void
 
     protected function checkMandatoryArticlesExist(): void
     {
-        foreach ($this->domain->getAll() as $domainConfig) {
+        foreach ($this->domain->getAdminEnabledDomainIds() as $domainId) {
+            $domainConfig = $this->domain->getDomainConfigById($domainId);
+
             if ($this->setting->getForDomain(Setting::TERMS_AND_CONDITIONS_ARTICLE_ID, $domainConfig->getId()) === null) {
                 $this->addErrorFlashTwig(
                     t('<a href="{{ url }}">Terms and conditions article for domain {{ domainName }} is not set.</a>'),

From 9e86b8a7b3b5f04afcfef96538ea59e14f1f08e5 Mon Sep 17 00:00:00 2001
From: Martin Grossmann <martin@vyvoj.net>
Date: Mon, 26 Aug 2024 12:17:12 +0200
Subject: [PATCH 14/32] added select all/none buttons

---
 .../js/admin/components/SelectAdminDomains.js | 27 ++++++++++++
 assets/js/admin/components/index.js           |  1 +
 assets/styles/admin/todo.less                 | 41 +++++++++++--------
 src/Resources/translations/messages.cs.po     |  6 +++
 src/Resources/translations/messages.en.po     |  6 +++
 .../Admin/Form/adminDomainsForm.html.twig     | 21 +++++++---
 6 files changed, 80 insertions(+), 22 deletions(-)
 create mode 100644 assets/js/admin/components/SelectAdminDomains.js

diff --git a/assets/js/admin/components/SelectAdminDomains.js b/assets/js/admin/components/SelectAdminDomains.js
new file mode 100644
index 0000000000..03511128ce
--- /dev/null
+++ b/assets/js/admin/components/SelectAdminDomains.js
@@ -0,0 +1,27 @@
+import Register from '../../common/utils/Register';
+
+export default class SelectAdminDomains {
+
+    constructor ($selectDomainsDropdown) {
+        this.$selectDomainsDropdown = $selectDomainsDropdown;
+        this.$selectDomainsDropdown.find('.js-domains-select-all').on('click', () => this.selectAll());
+        this.$selectDomainsDropdown.find('.js-domains-select-none').on('click', () => this.selectNone());
+    }
+
+    static init () {
+        $('.js-domains-select').each(function () {
+            // eslint-disable-next-line no-new
+            new SelectAdminDomains($(this));
+        });
+    }
+
+    selectAll () {
+        this.$selectDomainsDropdown.find('input[type=checkbox]').prop('checked', true);
+    }
+
+    selectNone () {
+        this.$selectDomainsDropdown.find('input[type=checkbox]').prop('checked', false);
+    }
+}
+
+(new Register()).registerCallback(SelectAdminDomains.init, 'SelectAdminDomains.init');
diff --git a/assets/js/admin/components/index.js b/assets/js/admin/components/index.js
index 7525d346c3..0f72c97888 100644
--- a/assets/js/admin/components/index.js
+++ b/assets/js/admin/components/index.js
@@ -53,6 +53,7 @@ import './PromoCodeGroup';
 import './PromoCodeLimits';
 import './RoleGroups';
 import './initSelect2';
+import './SelectAdminDomains';
 import './SelectToggle';
 import './SideMenu';
 import './SortableValues';
diff --git a/assets/styles/admin/todo.less b/assets/styles/admin/todo.less
index e014fbd414..da09a17705 100644
--- a/assets/styles/admin/todo.less
+++ b/assets/styles/admin/todo.less
@@ -4,30 +4,31 @@
 */
 
 .list-files__item .form-line__side {
-  margin-left: 0;
+    margin-left: 0;
 }
 
 .table-fixed {
-  table-layout: fixed;
+    table-layout: fixed;
 }
 
 .edit-uuid {
-  font-size: 45%;
-  color: grey;
-  margin-left: 1em;
+    font-size: 45%;
+    color: grey;
+    margin-left: 1em;
 }
 
 .opening-hours-widget {
-  display: flex;
-  align-items: baseline;
-  .form-line {
-    padding-top: 0 !important;
-    padding-bottom: 0 !important;
-  }
+    display: flex;
+    align-items: baseline;
+
+    .form-line {
+        padding-top: 0 !important;
+        padding-bottom: 0 !important;
+    }
 }
 
 .js-promo-code-group-unpack {
-  float: right;
+    float: right;
 }
 
 .multi-column-list {
@@ -50,12 +51,12 @@
     break-inside: avoid;
 }
 
- .box-dropdown__options__item label {
-     color: @color-base;
- }
+.box-dropdown__options__item label {
+    color: @color-base;
+}
 
 .table-form-cell-short {
-  width: 335px;
+    width: 335px;
 }
 
 .administrator_customer_list .table-grid__cell--actions {
@@ -63,7 +64,13 @@
 }
 
 .form-bg-color {
-  background-color: @color-f;
+    background-color: @color-f;
+}
+
+.select-domain-buttons {
+    background-color: @color-f;
+    padding-bottom: 1em;
+    padding-right: 1em;
 }
 
 .table-col-200px{
diff --git a/src/Resources/translations/messages.cs.po b/src/Resources/translations/messages.cs.po
index efbd21e481..29aeed7633 100644
--- a/src/Resources/translations/messages.cs.po
+++ b/src/Resources/translations/messages.cs.po
@@ -3487,9 +3487,15 @@ msgstr "Vyhledávání hledá v názvu produktu, katalogovém čísle produktu,
 msgid "Searching searches in slugs. It is possible to use wildcards * and ?."
 msgstr "Vyhledávání hledá ve sluzích. Je možné používat operátory * a ?."
 
+msgid "Select all"
+msgstr "Vybrat vše"
+
 msgid "Select new value"
 msgstr "Zvolte novou hodnotu"
 
+msgid "Select none"
+msgstr "Nevybrat nic"
+
 msgid "Selected SEO page cannot be deleted"
 msgstr "Vybraná SEO stránka nemůže být smazána"
 
diff --git a/src/Resources/translations/messages.en.po b/src/Resources/translations/messages.en.po
index c43f10ef7a..7253c7bbc1 100644
--- a/src/Resources/translations/messages.en.po
+++ b/src/Resources/translations/messages.en.po
@@ -3487,9 +3487,15 @@ msgstr ""
 msgid "Searching searches in slugs. It is possible to use wildcards * and ?."
 msgstr ""
 
+msgid "Select all"
+msgstr ""
+
 msgid "Select new value"
 msgstr ""
 
+msgid "Select none"
+msgstr ""
+
 msgid "Selected SEO page cannot be deleted"
 msgstr ""
 
diff --git a/src/Resources/views/Admin/Form/adminDomainsForm.html.twig b/src/Resources/views/Admin/Form/adminDomainsForm.html.twig
index 753aad9f45..c402755e1e 100644
--- a/src/Resources/views/Admin/Form/adminDomainsForm.html.twig
+++ b/src/Resources/views/Admin/Form/adminDomainsForm.html.twig
@@ -1,10 +1,21 @@
-{{ form_start(form, {'action': path('admin_domains_filter'), 'method': 'POST'}) }}
-    <ul class="js-toggle-menu-submenu box-dropdown__options multi-column-list">
+<div class="js-toggle-menu-submenu box-dropdown__options js-domains-select">
+    {{ form_start(form, {'action': path('admin_domains_filter'), 'method': 'POST'}) }}
+    <ul class="multi-column-list">
         {% for child in form.domains %}
             <li class="box-dropdown__options__item">
-                {{ form_row(child) }}
+                <div class="form-choice form-choice--inline-checkbox">
+                    {{ form_widget(child, { inFormChoice: true }) }}
+                    {{ form_label(child) }}
+                    {{ form_errors(child) }}
+                </div>
             </li>
         {% endfor %}
-        {{ form_row(form.apply) }}
     </ul>
-{{ form_end(form) }}
+    <div class="select-domain-buttons">
+        <button class="btn btn--light btn--small js-domains-select-all" type="button">{{ 'Select all'|trans }}</button>
+        <button class="btn btn--light btn--small js-domains-select-none"
+                type="button">{{ 'Select none'|trans }}</button>
+        {{ form_widget(form.apply) }}
+    </div>
+    {{ form_end(form) }}
+</div>

From 7506a0177b9a36412f777bcabb52017589973727 Mon Sep 17 00:00:00 2001
From: Martin Grossmann <martin@vyvoj.net>
Date: Mon, 26 Aug 2024 12:58:13 +0200
Subject: [PATCH 15/32] fixed centering tooltip window on large height windows

---
 assets/js/admin/utils/Window.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/js/admin/utils/Window.js b/assets/js/admin/utils/Window.js
index 9f17c89b3f..1d77b91c6c 100644
--- a/assets/js/admin/utils/Window.js
+++ b/assets/js/admin/utils/Window.js
@@ -133,8 +133,8 @@ export default class Window {
     }
 
     moveToCenter () {
-        let relativeY = $(window).height() / 2 - this.$window.height() / 2;
-        let minRelativeY = $(window).height() * 0.1;
+        let relativeY = window.innerHeight / 2 - this.$window.height() / 2;
+        let minRelativeY = window.innerHeight * 0.1;
 
         if (relativeY < minRelativeY) {
             relativeY = minRelativeY;

From 6f270706d1208e980eebccfb2d3e2103590e967d Mon Sep 17 00:00:00 2001
From: Martin Grossmann <martin@vyvoj.net>
Date: Tue, 3 Sep 2024 22:33:17 +0200
Subject: [PATCH 16/32] XML feeds are now displayed only for managed domains

---
 src/Controller/Admin/FeedController.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Controller/Admin/FeedController.php b/src/Controller/Admin/FeedController.php
index a6880b195e..5df85fc79d 100644
--- a/src/Controller/Admin/FeedController.php
+++ b/src/Controller/Admin/FeedController.php
@@ -101,9 +101,14 @@ public function listAction()
         $feedsData = [];
         $feedConfigs = $this->feedRegistry->getAllFeedConfigs();
 
+        $allowedDomainIds = $this->domain->getAdminEnabledDomainIds();
 
         foreach ($feedConfigs as $feedConfig) {
             foreach ($feedConfig->getDomainIds() as $domainId) {
+                if (!in_array($domainId, $allowedDomainIds, true)) {
+                    continue;
+                }
+
                 $domainConfig = $this->domain->getDomainConfigById($domainId);
                 $feedInfo = $feedConfig->getFeed()->getInfo();
                 $feedModulesIndexedByDomainId = $this->feedModuleRepository->getFeedModulesByConfigIndexedByDomainId($feedConfig);

From 4ce7b52f812499467200645d64fc6e3038298ec5 Mon Sep 17 00:00:00 2001
From: Martin Grossmann <martin@vyvoj.net>
Date: Tue, 3 Sep 2024 06:59:25 +0200
Subject: [PATCH 17/32] improved performance of loading all settings

---
 src/Component/Domain/Domain.php               |  2 ++
 src/Component/Setting/Setting.php             | 21 +++++++++++++++++++
 .../Setting/SettingValueRepository.php        |  8 +++++++
 3 files changed, 31 insertions(+)

diff --git a/src/Component/Domain/Domain.php b/src/Component/Domain/Domain.php
index 29907022bd..f53f6f9d5d 100644
--- a/src/Component/Domain/Domain.php
+++ b/src/Component/Domain/Domain.php
@@ -91,6 +91,8 @@ public function getAll()
     {
         $domainConfigsWithDataCreated = [];
 
+        $this->setting->initAllDomainsSettings();
+
         foreach ($this->domainConfigs as $domainConfig) {
             $domainId = $domainConfig->getId();
 
diff --git a/src/Component/Setting/Setting.php b/src/Component/Setting/Setting.php
index 5a7493097f..c63e0ac42d 100644
--- a/src/Component/Setting/Setting.php
+++ b/src/Component/Setting/Setting.php
@@ -33,6 +33,8 @@ class Setting
      */
     protected array $values;
 
+    protected bool $allValuesLoaded = false;
+
     /**
      * @param \Doctrine\ORM\EntityManagerInterface $em
      * @param \Shopsys\FrameworkBundle\Component\Setting\SettingValueRepository $settingValueRepository
@@ -124,6 +126,24 @@ public function setForDomain($key, $value, $domainId)
         $this->em->flush();
     }
 
+    public function initAllDomainsSettings(): void
+    {
+        if ($this->allValuesLoaded) {
+            return;
+        }
+
+        $settings = $this->settingValueRepository->getAllDomainsSettingValues();
+
+        foreach ($settings as $settingValue) {
+            $domainId = $settingValue->getDomainId();
+            $settingName = $settingValue->getName();
+
+            $this->values[$domainId][$settingName] = $settingValue;
+        }
+
+        $this->allValuesLoaded = true;
+    }
+
     /**
      * @param int|null $domainId
      */
@@ -148,6 +168,7 @@ protected function loadDomainValues($domainId)
 
     public function clearCache()
     {
+        $this->allValuesLoaded = false;
         $this->values = [];
     }
 }
diff --git a/src/Component/Setting/SettingValueRepository.php b/src/Component/Setting/SettingValueRepository.php
index cbbac342e7..96c28d9398 100644
--- a/src/Component/Setting/SettingValueRepository.php
+++ b/src/Component/Setting/SettingValueRepository.php
@@ -33,6 +33,14 @@ public function getAllByDomainId($domainId)
         return $this->getSettingValueRepository()->findBy(['domainId' => $domainId]);
     }
 
+    /**
+     * @return \Shopsys\FrameworkBundle\Component\Setting\SettingValue[]
+     */
+    public function getAllDomainsSettingValues(): array
+    {
+        return $this->getSettingValueRepository()->findAll();
+    }
+
     /**
      * @param int $fromDomainId
      * @param int $toDomainId

From 342467b39723935820f7674115bc7c80e7fd3944 Mon Sep 17 00:00:00 2001
From: Martin Grossmann <martin@vyvoj.net>
Date: Tue, 3 Sep 2024 22:37:53 +0200
Subject: [PATCH 18/32] blog category form type now take into account selected
 domain

---
 src/Controller/Admin/BrandController.php         |  3 +--
 src/Form/Admin/Blog/BlogCategoryFormType.php     |  2 +-
 .../views/Admin/Content/Brand/list.html.twig     | 16 +++++++++-------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/Controller/Admin/BrandController.php b/src/Controller/Admin/BrandController.php
index e57798204a..4640dd22a8 100644
--- a/src/Controller/Admin/BrandController.php
+++ b/src/Controller/Admin/BrandController.php
@@ -78,7 +78,6 @@ public function editAction(Request $request, $id)
         return $this->render('@ShopsysFramework/Admin/Content/Brand/edit.html.twig', [
             'form' => $form->createView(),
             'brand' => $brand,
-            'domains' => $this->domain->getAll(),
         ]);
     }
 
@@ -107,7 +106,7 @@ public function listAction()
 
         return $this->render('@ShopsysFramework/Admin/Content/Brand/list.html.twig', [
             'gridView' => $grid->createView(),
-            'domains' => $this->domain->getAll(),
+            'domains' => $this->domain->getAdminEnabledDomains(),
         ]);
     }
 
diff --git a/src/Form/Admin/Blog/BlogCategoryFormType.php b/src/Form/Admin/Blog/BlogCategoryFormType.php
index 42810a34fc..b60d182cca 100644
--- a/src/Form/Admin/Blog/BlogCategoryFormType.php
+++ b/src/Form/Admin/Blog/BlogCategoryFormType.php
@@ -157,7 +157,7 @@ private function prepareSeoData(array $options): array
         $seoMetaDescriptionsOptionsByDomainId = [];
         $seoH1OptionsByDomainId = [];
 
-        foreach ($this->domain->getAll() as $domainConfig) {
+        foreach ($this->domain->getAdminEnabledDomains() as $domainConfig) {
             $domainId = $domainConfig->getId();
 
             $seoTitlesOptionsByDomainId[$domainId] = [
diff --git a/src/Resources/views/Admin/Content/Brand/list.html.twig b/src/Resources/views/Admin/Content/Brand/list.html.twig
index 141ce3e24c..ca8fa27fe6 100644
--- a/src/Resources/views/Admin/Content/Brand/list.html.twig
+++ b/src/Resources/views/Admin/Content/Brand/list.html.twig
@@ -4,6 +4,15 @@
 {% block h1 %}{{ 'Brand overview'|trans }}{% endblock %}
 
 {% block main_content %}
+    <div class="wrap-bar">
+        <a href="{{ url('admin_brand_new') }}" class="btn btn--primary btn--plus wrap-bar__btn">
+            <i class="btn__icon">+</i>
+            {{ 'Create new brand'|trans }}
+        </a>
+    </div>
+
+    {{ gridView.render() }}
+
     <div class="wrap-divider wrap-divider--bottom">
         <div class="form-group">
             <h2 class="form-group__title">
@@ -30,11 +39,4 @@
             </div>
         </div>
     </div>
-    <div class="wrap-bar">
-        <a href="{{ url('admin_brand_new') }}" class="btn btn--primary btn--plus wrap-bar__btn">
-            <i class="btn__icon">+</i>
-            {{ 'Create new brand'|trans }}
-        </a>
-    </div>
-    {{ gridView.render() }}
 {% endblock %}

From b9b1636bd1b5a30b16023303b52c006243da669c Mon Sep 17 00:00:00 2001
From: Martin Grossmann <martin@vyvoj.net>
Date: Wed, 4 Sep 2024 10:51:25 +0200
Subject: [PATCH 19/32] orders are now displayed only for managed domains

---
 src/Controller/Admin/OrderController.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Controller/Admin/OrderController.php b/src/Controller/Admin/OrderController.php
index 827b83a525..86d8ed98f7 100644
--- a/src/Controller/Admin/OrderController.php
+++ b/src/Controller/Admin/OrderController.php
@@ -175,6 +175,10 @@ public function listAction(Request $request): Response
             $queryBuilder
                 ->andWhere('o.domainId = :selectedDomainId')
                 ->setParameter('selectedDomainId', $selectedDomainId);
+        } else {
+            $queryBuilder
+                ->andWhere('o.domainId IN (:domainIds)')
+                ->setParameter('domainIds', $this->domain->getAdminEnabledDomainIds());
         }
 
         $dataSource = new QueryBuilderWithRowManipulatorDataSource(

From e3a0f49d6447f8131fc10ccccf5b73234043e45b Mon Sep 17 00:00:00 2001
From: Martin Grossmann <martin@vyvoj.net>
Date: Wed, 4 Sep 2024 10:53:30 +0200
Subject: [PATCH 20/32] domain filter is now displayed even for one domain

---
 src/Resources/views/Admin/Inline/Domain/filter.html.twig  | 2 +-
 src/Resources/views/Admin/Inline/Domain/locales.html.twig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Resources/views/Admin/Inline/Domain/filter.html.twig b/src/Resources/views/Admin/Inline/Domain/filter.html.twig
index d39771c52a..2468b12dcf 100644
--- a/src/Resources/views/Admin/Inline/Domain/filter.html.twig
+++ b/src/Resources/views/Admin/Inline/Domain/filter.html.twig
@@ -1,4 +1,4 @@
-{% if domainConfigs|length > 1 %}
+{% if isMultidomain() %}
     <div class="in-domain" role="tablist">
         {% if selectedDomainId is null %}
             <span class="in-domain__item in-domain__item--active">
diff --git a/src/Resources/views/Admin/Inline/Domain/locales.html.twig b/src/Resources/views/Admin/Inline/Domain/locales.html.twig
index 0614db7191..e8e01fb0d8 100644
--- a/src/Resources/views/Admin/Inline/Domain/locales.html.twig
+++ b/src/Resources/views/Admin/Inline/Domain/locales.html.twig
@@ -1,4 +1,4 @@
-{% if domainConfigs|length > 1 %}
+{% if isMultidomain() %}
     <div class="in-domain" role="tablist">
         {% for domainConfig in domainConfigs %}
             {% if domainConfig.id is same as selectedDomainId %}

From 434211e29a743796bbef7a22b3edc1b6a89e14d9 Mon Sep 17 00:00:00 2001
From: Martin Grossmann <martin@vyvoj.net>
Date: Wed, 11 Sep 2024 12:05:03 +0200
Subject: [PATCH 21/32] it is now possible to close admin menu wth consecutive
 click on the menu element

---
 assets/js/admin/components/ToggleMenu.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/assets/js/admin/components/ToggleMenu.js b/assets/js/admin/components/ToggleMenu.js
index 4fa5929233..162c56e6aa 100644
--- a/assets/js/admin/components/ToggleMenu.js
+++ b/assets/js/admin/components/ToggleMenu.js
@@ -7,10 +7,14 @@ export default class ToggleMenu {
         this.$items = $toggleMenu.filterAllNodes('.js-toggle-menu-item');
 
         this.$items.click(function (event) {
+            const isOpened = $(this).hasClass('open');
+
             ToggleMenu.hideAllSubmenus(_this);
 
-            $(this).filterAllNodes('.js-toggle-menu-submenu').show();
-            $(this).addClass('open');
+            if (!isOpened) {
+                $(this).filterAllNodes('.js-toggle-menu-submenu').show();
+                $(this).addClass('open');
+            }
 
             event.stopPropagation();
         });
@@ -18,6 +22,10 @@ export default class ToggleMenu {
         $(document).on('click', function () {
             ToggleMenu.hideAllSubmenus(_this);
         });
+
+        this.$items.find('.js-toggle-menu-submenu').on('click', function (event) {
+            event.stopPropagation();
+        });
     }
 
     static hideAllSubmenus (toggleMenu) {

From b31b68f5d18667fba69563638075706f10111cbe Mon Sep 17 00:00:00 2001
From: Martin Grossmann <martin@vyvoj.net>
Date: Wed, 11 Sep 2024 13:48:57 +0200
Subject: [PATCH 22/32] domain type is now aware of admin selected domains

---
 src/Form/DomainType.php  | 35 +++++++++++++++++++++++++++++------
 src/Form/DomainsType.php |  2 +-
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/Form/DomainType.php b/src/Form/DomainType.php
index 6824ea9f30..b7032fa8ab 100644
--- a/src/Form/DomainType.php
+++ b/src/Form/DomainType.php
@@ -4,6 +4,7 @@
 
 namespace Shopsys\FrameworkBundle\Form;
 
+use Shopsys\FrameworkBundle\Component\Domain\AdminDomainTabsFacade;
 use Shopsys\FrameworkBundle\Component\Domain\Domain;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\IntegerType;
@@ -15,34 +16,56 @@ class DomainType extends AbstractType
 {
     /**
      * @param \Shopsys\FrameworkBundle\Component\Domain\Domain $domain
+     * @param \Shopsys\FrameworkBundle\Component\Domain\AdminDomainTabsFacade $adminDomainTabsFacade
      */
-    public function __construct(private readonly Domain $domain)
-    {
+    public function __construct(
+        private readonly Domain $domain,
+        private readonly AdminDomainTabsFacade $adminDomainTabsFacade,
+    ) {
     }
 
     /**
      * {@inheritdoc}
      */
-    public function buildView(FormView $view, FormInterface $form, array $options)
+    public function buildView(FormView $view, FormInterface $form, array $options): void
     {
-        $view->vars['domainConfigs'] = $this->domain->getAll();
+        $view->vars['domainConfigs'] = $this->getSortedDomainConfigsByAdminDomainTabs();
         $view->vars['displayUrl'] = $options['displayUrl'];
     }
 
     /**
      * @param \Symfony\Component\OptionsResolver\OptionsResolver $resolver
      */
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'displayUrl' => false,
         ]);
     }
 
+    /**
+     * @return \Shopsys\FrameworkBundle\Component\Domain\Config\DomainConfig[]
+     */
+    private function getSortedDomainConfigsByAdminDomainTabs(): array
+    {
+        $selectedDomainId = $this->adminDomainTabsFacade->getSelectedDomainId();
+
+        $list = [];
+        $list[] = $this->adminDomainTabsFacade->getSelectedDomainConfig();
+
+        foreach ($this->domain->getAdminEnabledDomains() as $domainConfig) {
+            if ($domainConfig->getId() !== $selectedDomainId) {
+                $list[] = $domainConfig;
+            }
+        }
+
+        return $list;
+    }
+
     /**
      * {@inheritdoc}
      */
-    public function getParent(): ?string
+    public function getParent(): string
     {
         return IntegerType::class;
     }
diff --git a/src/Form/DomainsType.php b/src/Form/DomainsType.php
index 7cd2eab8c1..ad986c62f2 100644
--- a/src/Form/DomainsType.php
+++ b/src/Form/DomainsType.php
@@ -24,7 +24,7 @@ public function __construct(private readonly Domain $domain)
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        foreach ($this->domain->getAll() as $domainConfig) {
+        foreach ($this->domain->getAdminEnabledDomains() as $domainConfig) {
             $builder->add((string)$domainConfig->getId(), CheckboxType::class, [
                 'required' => false,
                 'label' => $domainConfig->getName(),

From 9451d7b033ce60aa2979244cdf7c86cb992247ce Mon Sep 17 00:00:00 2001
From: Martin Grossmann <martin@vyvoj.net>
Date: Wed, 11 Sep 2024 13:50:09 +0200
Subject: [PATCH 23/32] category form type now take into account selected
 domain

---
 src/Form/Admin/Category/CategoryFormType.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Form/Admin/Category/CategoryFormType.php b/src/Form/Admin/Category/CategoryFormType.php
index 87951afd9c..0faf8a2b3b 100644
--- a/src/Form/Admin/Category/CategoryFormType.php
+++ b/src/Form/Admin/Category/CategoryFormType.php
@@ -65,7 +65,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $seoMetaDescriptionsOptionsByDomainId = [];
         $seoH1OptionsByDomainId = [];
 
-        foreach ($this->domain->getAll() as $domainConfig) {
+        foreach ($this->domain->getAdminEnabledDomains() as $domainConfig) {
             $domainId = $domainConfig->getId();
 
             $seoTitlesOptionsByDomainId[$domainId] = [

From ad28bb08c8dea8fe0988b0fe905f9d75e2f91c6a Mon Sep 17 00:00:00 2001
From: Martin Grossmann <martin@vyvoj.net>
Date: Wed, 11 Sep 2024 13:50:54 +0200
Subject: [PATCH 24/32] payment form type now take into account selected domain

---
 src/Form/Admin/Payment/PaymentFormType.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/Form/Admin/Payment/PaymentFormType.php b/src/Form/Admin/Payment/PaymentFormType.php
index f9e79304a3..4d5bae6571 100644
--- a/src/Form/Admin/Payment/PaymentFormType.php
+++ b/src/Form/Admin/Payment/PaymentFormType.php
@@ -213,11 +213,21 @@ private function getGopayPaymentMethodOptionsByDomainId(): array
         $allGoPayPaymentMethods = $this->goPayPaymentMethodFacade->getAll();
         $optionsByDomainId = [];
 
+        $adminEnabledDomainIds = $this->domain->getAdminEnabledDomainIds();
+
         foreach ($allGoPayPaymentMethods as $goPayPaymentMethod) {
+            if (!in_array($goPayPaymentMethod->getDomainId(), $adminEnabledDomainIds, true)) {
+                continue;
+            }
+
             $optionsByDomainId[$goPayPaymentMethod->getDomainId()]['choices'][] = $goPayPaymentMethod;
         }
 
         foreach ($optionsByDomainId as $domainId => $options) {
+            if (!in_array($domainId, $adminEnabledDomainIds, true)) {
+                continue;
+            }
+
             $optionsByDomainId[$domainId]['group_by'] = function (GoPayPaymentMethod $goPayPaymentMethod): string {
                 return $goPayPaymentMethod->isAvailable() ? t('Available') : t('Hidden in GoPay');
             };
@@ -253,6 +263,10 @@ public function validateGopayPaymentMethod(PaymentData $paymentData, ExecutionCo
         }
 
         foreach ($paymentData->enabled as $domainId => $enabled) {
+            if (!in_array($domainId, $this->domain->getAdminEnabledDomainIds(), true)) {
+                continue;
+            }
+
             if ($enabled && $paymentData->goPayPaymentMethodByDomainId[$domainId] === null) {
                 $context->buildViolation('Please select GoPay payment method for enabled domain ' . $this->domain->getDomainConfigById($domainId)->getName())
                     ->atPath('goPayPaymentMethodByDomainId[1]')

From 22af305b538826ad3f02f31262de210ecd44ac69 Mon Sep 17 00:00:00 2001
From: Martin Grossmann <martin@vyvoj.net>
Date: Wed, 11 Sep 2024 15:49:24 +0200
Subject: [PATCH 25/32] complaints are now displayed only for managed domains

---
 src/Controller/Admin/ComplaintController.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Controller/Admin/ComplaintController.php b/src/Controller/Admin/ComplaintController.php
index d6961c5016..cfed060a4a 100644
--- a/src/Controller/Admin/ComplaintController.php
+++ b/src/Controller/Admin/ComplaintController.php
@@ -73,6 +73,10 @@ public function listAction(Request $request): Response
             $queryBuilder
                 ->andWhere('cmp.domainId = :selectedDomainId')
                 ->setParameter('selectedDomainId', $selectedDomainId);
+        } else {
+            $queryBuilder
+                ->andWhere('cmp.domainId IN (:domainIds)')
+                ->setParameter('domainIds', $this->domain->getAdminEnabledDomainIds());
         }
 
         return $this->render('@ShopsysFramework/Admin/Content/Complaint/list.html.twig', [

From c62377fa899f417538e142316b82c971618dee81 Mon Sep 17 00:00:00 2001
From: Martin Grossmann <martin@vyvoj.net>
Date: Wed, 11 Sep 2024 16:14:38 +0200
Subject: [PATCH 26/32] setting free transport takes into account admin
 selected domains

---
 .../FreeTransportAndPaymentPriceLimitsFormType.php              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Form/Admin/TransportAndPayment/FreeTransportAndPaymentPriceLimitsFormType.php b/src/Form/Admin/TransportAndPayment/FreeTransportAndPaymentPriceLimitsFormType.php
index 260e8163de..96cdda967d 100644
--- a/src/Form/Admin/TransportAndPayment/FreeTransportAndPaymentPriceLimitsFormType.php
+++ b/src/Form/Admin/TransportAndPayment/FreeTransportAndPaymentPriceLimitsFormType.php
@@ -49,7 +49,7 @@ private function getPriceLimitsBuilder(FormBuilderInterface $builder)
     {
         $formBuilderForDomains = $builder->create(self::DOMAINS_SUBFORM_NAME, null, ['compound' => true]);
 
-        foreach ($this->domain->getAll() as $domainConfig) {
+        foreach ($this->domain->getAdminEnabledDomains() as $domainConfig) {
             $formBuilderForDomain = $builder->create((string)$domainConfig->getId(), null, [
                 'compound' => true,
                 'validation_groups' => function (FormInterface $form) {

From a72d43701b08c9b1e757a4f89f42ba0885e097f1 Mon Sep 17 00:00:00 2001
From: Martin Grossmann <martin@vyvoj.net>
Date: Fri, 13 Sep 2024 19:33:21 +0200
Subject: [PATCH 27/32] records with mandatory domain inputs cannot be created
 unless all domains are enabled

---
 src/Controller/Admin/CountryController.php            |  9 +++++++++
 .../Admin/CustomerUserRoleGroupController.php         | 11 ++++++++++-
 src/Controller/Admin/ParameterController.php          |  9 +++++++++
 src/Controller/Admin/SeoPageController.php            |  6 ++++++
 .../Status/Grid/ComplaintStatusInlineEdit.php         | 10 ++++++++++
 src/Model/Order/Status/Grid/OrderStatusInlineEdit.php | 10 ++++++++++
 src/Model/Product/Unit/UnitInlineEdit.php             | 10 ++++++++++
 src/Resources/translations/messages.cs.po             |  4 ++++
 src/Resources/translations/messages.en.po             |  4 ++++
 9 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/src/Controller/Admin/CountryController.php b/src/Controller/Admin/CountryController.php
index 4a5bb63ee0..9176862d1b 100644
--- a/src/Controller/Admin/CountryController.php
+++ b/src/Controller/Admin/CountryController.php
@@ -4,6 +4,7 @@
 
 namespace Shopsys\FrameworkBundle\Controller\Admin;
 
+use Shopsys\FrameworkBundle\Component\Domain\Domain;
 use Shopsys\FrameworkBundle\Form\Admin\Country\CountryFormType;
 use Shopsys\FrameworkBundle\Model\AdminNavigation\BreadcrumbOverrider;
 use Shopsys\FrameworkBundle\Model\Country\CountryDataFactory;
@@ -20,12 +21,14 @@ class CountryController extends AdminBaseController
      * @param \Shopsys\FrameworkBundle\Model\Country\CountryDataFactory $countryDataFactory
      * @param \Shopsys\FrameworkBundle\Model\Country\CountryFacade $countryFacade
      * @param \Shopsys\FrameworkBundle\Model\AdminNavigation\BreadcrumbOverrider $breadcrumbOverrider
+     * @param \Shopsys\FrameworkBundle\Component\Domain\Domain $domain
      */
     public function __construct(
         protected readonly CountryGridFactory $countryGridFactory,
         protected readonly CountryDataFactory $countryDataFactory,
         protected readonly CountryFacade $countryFacade,
         protected readonly BreadcrumbOverrider $breadcrumbOverrider,
+        protected readonly Domain $domain,
     ) {
     }
 
@@ -96,6 +99,12 @@ public function newAction(Request $request): Response
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
+            if (!$this->domain->hasAdminAllDomainsEnabled()) {
+                $this->addErrorFlash(t('Creating a record requires all domains to be enabled as domain-specific fields cannot be empty. If you want to proceed, select all domains in the Domain filter in the header first.'));
+
+                return $this->redirectToRoute('admin_country_new');
+            }
+
             $country = $this->countryFacade->create($countryData);
 
             $this
diff --git a/src/Controller/Admin/CustomerUserRoleGroupController.php b/src/Controller/Admin/CustomerUserRoleGroupController.php
index 88dee04ca9..3107b92f7f 100644
--- a/src/Controller/Admin/CustomerUserRoleGroupController.php
+++ b/src/Controller/Admin/CustomerUserRoleGroupController.php
@@ -4,6 +4,7 @@
 
 namespace Shopsys\FrameworkBundle\Controller\Admin;
 
+use Shopsys\FrameworkBundle\Component\Domain\Domain;
 use Shopsys\FrameworkBundle\Component\Router\Security\Annotation\CsrfProtection;
 use Shopsys\FrameworkBundle\Form\Admin\Customer\RoleGroup\CustomerUserRoleGroupFormType;
 use Shopsys\FrameworkBundle\Model\AdminNavigation\BreadcrumbOverrider;
@@ -21,12 +22,14 @@ class CustomerUserRoleGroupController extends AdminBaseController
      * @param \Shopsys\FrameworkBundle\Model\Customer\User\Role\CustomerUserRoleGroupDataFactory $customerUserRoleGroupDataFactory
      * @param \Shopsys\FrameworkBundle\Model\Customer\User\Role\CustomerUserRoleGroupFacade $customerUserRoleGroupFacade
      * @param \Shopsys\FrameworkBundle\Model\AdminNavigation\BreadcrumbOverrider $breadcrumbOverrider
+     * @param \Shopsys\FrameworkBundle\Component\Domain\Domain $domain
      */
     public function __construct(
         protected readonly CustomerUserRoleGroupGridFactory $gridFactory,
         protected readonly CustomerUserRoleGroupDataFactory $customerUserRoleGroupDataFactory,
         protected readonly CustomerUserRoleGroupFacade $customerUserRoleGroupFacade,
         protected readonly BreadcrumbOverrider $breadcrumbOverrider,
+        protected readonly Domain $domain,
     ) {
     }
 
@@ -51,12 +54,18 @@ public function listAction(): Response
     public function newAction(Request $request): Response
     {
         $roleGroupData = $this->customerUserRoleGroupDataFactory->create();
-        $form = $this->createForm(CustomerUserRoleGroupFormType::class, $roleGroupData, []);
+        $form = $this->createForm(CustomerUserRoleGroupFormType::class, $roleGroupData);
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
             $customerUserRoleGroup = $this->customerUserRoleGroupFacade->create($roleGroupData);
 
+            if (!$this->domain->hasAdminAllDomainsEnabled()) {
+                $this->addErrorFlash(t('Creating a record requires all domains to be enabled as domain-specific fields cannot be empty. If you want to proceed, select all domains in the Domain filter in the header first.'));
+
+                return $this->redirectToRoute('admin_superadmin_customer_user_role_group_new');
+            }
+
             $this->addSuccessFlashTwig(
                 t('Customer user role group <strong><a href="{{ url }}">{{ name }}</a></strong> was created'),
                 [
diff --git a/src/Controller/Admin/ParameterController.php b/src/Controller/Admin/ParameterController.php
index 1e6ff33384..7deab09e26 100644
--- a/src/Controller/Admin/ParameterController.php
+++ b/src/Controller/Admin/ParameterController.php
@@ -4,6 +4,7 @@
 
 namespace Shopsys\FrameworkBundle\Controller\Admin;
 
+use Shopsys\FrameworkBundle\Component\Domain\Domain;
 use Shopsys\FrameworkBundle\Component\Router\Security\Annotation\CsrfProtection;
 use Shopsys\FrameworkBundle\Form\Admin\Product\Parameter\ParameterFormType;
 use Shopsys\FrameworkBundle\Model\Product\Parameter\Exception\ParameterNotFoundException;
@@ -20,11 +21,13 @@ class ParameterController extends AdminBaseController
      * @param \Shopsys\FrameworkBundle\Model\Product\Parameter\ParameterFacade $parameterFacade
      * @param \Shopsys\FrameworkBundle\Model\Product\Parameter\ParameterGridFactory $parameterGridFactory
      * @param \Shopsys\FrameworkBundle\Model\Product\Parameter\ParameterDataFactoryInterface $parameterDataFactory
+     * @param \Shopsys\FrameworkBundle\Component\Domain\Domain $domain
      */
     public function __construct(
         protected readonly ParameterFacade $parameterFacade,
         protected readonly ParameterGridFactory $parameterGridFactory,
         protected readonly ParameterDataFactoryInterface $parameterDataFactory,
+        protected readonly Domain $domain,
     ) {
     }
 
@@ -53,6 +56,12 @@ public function newAction(Request $request): Response
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
+            if (!$this->domain->hasAdminAllDomainsEnabled()) {
+                $this->addErrorFlash(t('Creating a record requires all domains to be enabled as domain-specific fields cannot be empty. If you want to proceed, select all domains in the Domain filter in the header first.'));
+
+                return $this->redirectToRoute('admin_parameter_new');
+            }
+
             $parameter = $this->parameterFacade->create($parameterData);
 
             $this->addSuccessFlashTwig(
diff --git a/src/Controller/Admin/SeoPageController.php b/src/Controller/Admin/SeoPageController.php
index 38d35e9b63..a5147c9eba 100644
--- a/src/Controller/Admin/SeoPageController.php
+++ b/src/Controller/Admin/SeoPageController.php
@@ -63,6 +63,12 @@ public function newAction(Request $request): Response
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
+            if (!$this->domain->hasAdminAllDomainsEnabled()) {
+                $this->addErrorFlash(t('Creating a record requires all domains to be enabled as domain-specific fields cannot be empty. If you want to proceed, select all domains in the Domain filter in the header first.'));
+
+                return $this->redirectToRoute('admin_seopage_new');
+            }
+
             $seoPage = $this->seoPageFacade->create($seoPageData);
 
             $this
diff --git a/src/Model/Complaint/Status/Grid/ComplaintStatusInlineEdit.php b/src/Model/Complaint/Status/Grid/ComplaintStatusInlineEdit.php
index 0beea8359a..83c0028571 100644
--- a/src/Model/Complaint/Status/Grid/ComplaintStatusInlineEdit.php
+++ b/src/Model/Complaint/Status/Grid/ComplaintStatusInlineEdit.php
@@ -4,7 +4,9 @@
 
 namespace Shopsys\FrameworkBundle\Model\Complaint\Status\Grid;
 
+use Shopsys\FrameworkBundle\Component\Domain\Domain;
 use Shopsys\FrameworkBundle\Component\Grid\InlineEdit\AbstractGridInlineEdit;
+use Shopsys\FrameworkBundle\Component\Grid\InlineEdit\Exception\InvalidFormDataException;
 use Shopsys\FrameworkBundle\Form\Admin\Complaint\Status\ComplaintStatusFormType;
 use Shopsys\FrameworkBundle\Model\Complaint\Status\ComplaintStatusDataFactory;
 use Shopsys\FrameworkBundle\Model\Complaint\Status\ComplaintStatusFacade;
@@ -18,12 +20,14 @@ class ComplaintStatusInlineEdit extends AbstractGridInlineEdit
      * @param \Shopsys\FrameworkBundle\Model\Complaint\Status\ComplaintStatusFacade $complaintStatusFacade
      * @param \Symfony\Component\Form\FormFactoryInterface $formFactory
      * @param \Shopsys\FrameworkBundle\Model\Complaint\Status\ComplaintStatusDataFactory $complaintStatusDataFactory
+     * @param \Shopsys\FrameworkBundle\Component\Domain\Domain $domain
      */
     public function __construct(
         ComplaintStatusGridFactory $complaintStatusGridFactory,
         protected readonly ComplaintStatusFacade $complaintStatusFacade,
         protected readonly FormFactoryInterface $formFactory,
         protected readonly ComplaintStatusDataFactory $complaintStatusDataFactory,
+        protected readonly Domain $domain,
     ) {
         parent::__construct($complaintStatusGridFactory);
     }
@@ -34,6 +38,12 @@ public function __construct(
      */
     protected function createEntityAndGetId($complaintStatusData): int
     {
+        if (!$this->domain->hasAdminAllDomainsEnabled()) {
+            throw new InvalidFormDataException([
+                t('Creating a record requires all domains to be enabled as domain-specific fields cannot be empty. If you want to proceed, select all domains in the Domain filter in the header first.'),
+            ]);
+        }
+
         $complaintStatus = $this->complaintStatusFacade->create($complaintStatusData);
 
         return $complaintStatus->getId();
diff --git a/src/Model/Order/Status/Grid/OrderStatusInlineEdit.php b/src/Model/Order/Status/Grid/OrderStatusInlineEdit.php
index 66d34d52c8..20ef4dd2f4 100644
--- a/src/Model/Order/Status/Grid/OrderStatusInlineEdit.php
+++ b/src/Model/Order/Status/Grid/OrderStatusInlineEdit.php
@@ -4,7 +4,9 @@
 
 namespace Shopsys\FrameworkBundle\Model\Order\Status\Grid;
 
+use Shopsys\FrameworkBundle\Component\Domain\Domain;
 use Shopsys\FrameworkBundle\Component\Grid\InlineEdit\AbstractGridInlineEdit;
+use Shopsys\FrameworkBundle\Component\Grid\InlineEdit\Exception\InvalidFormDataException;
 use Shopsys\FrameworkBundle\Form\Admin\Order\Status\OrderStatusFormType;
 use Shopsys\FrameworkBundle\Model\Order\Status\OrderStatusDataFactoryInterface;
 use Shopsys\FrameworkBundle\Model\Order\Status\OrderStatusFacade;
@@ -17,12 +19,14 @@ class OrderStatusInlineEdit extends AbstractGridInlineEdit
      * @param \Shopsys\FrameworkBundle\Model\Order\Status\OrderStatusFacade $orderStatusFacade
      * @param \Symfony\Component\Form\FormFactoryInterface $formFactory
      * @param \Shopsys\FrameworkBundle\Model\Order\Status\OrderStatusDataFactoryInterface $orderStatusDataFactory
+     * @param \Shopsys\FrameworkBundle\Component\Domain\Domain $domain
      */
     public function __construct(
         OrderStatusGridFactory $orderStatusGridFactory,
         protected readonly OrderStatusFacade $orderStatusFacade,
         protected readonly FormFactoryInterface $formFactory,
         protected readonly OrderStatusDataFactoryInterface $orderStatusDataFactory,
+        protected readonly Domain $domain,
     ) {
         parent::__construct($orderStatusGridFactory);
     }
@@ -33,6 +37,12 @@ public function __construct(
      */
     protected function createEntityAndGetId($orderStatusData)
     {
+        if (!$this->domain->hasAdminAllDomainsEnabled()) {
+            throw new InvalidFormDataException([
+                t('Creating a record requires all domains to be enabled as domain-specific fields cannot be empty. If you want to proceed, select all domains in the Domain filter in the header first.'),
+            ]);
+        }
+
         $orderStatus = $this->orderStatusFacade->create($orderStatusData);
 
         return $orderStatus->getId();
diff --git a/src/Model/Product/Unit/UnitInlineEdit.php b/src/Model/Product/Unit/UnitInlineEdit.php
index 76ba544469..371374d1d9 100644
--- a/src/Model/Product/Unit/UnitInlineEdit.php
+++ b/src/Model/Product/Unit/UnitInlineEdit.php
@@ -4,7 +4,9 @@
 
 namespace Shopsys\FrameworkBundle\Model\Product\Unit;
 
+use Shopsys\FrameworkBundle\Component\Domain\Domain;
 use Shopsys\FrameworkBundle\Component\Grid\InlineEdit\AbstractGridInlineEdit;
+use Shopsys\FrameworkBundle\Component\Grid\InlineEdit\Exception\InvalidFormDataException;
 use Shopsys\FrameworkBundle\Form\Admin\Product\Unit\UnitFormType;
 use Symfony\Component\Form\FormFactoryInterface;
 
@@ -15,12 +17,14 @@ class UnitInlineEdit extends AbstractGridInlineEdit
      * @param \Shopsys\FrameworkBundle\Model\Product\Unit\UnitFacade $unitFacade
      * @param \Symfony\Component\Form\FormFactoryInterface $formFactory
      * @param \Shopsys\FrameworkBundle\Model\Product\Unit\UnitDataFactoryInterface $unitDataFactory
+     * @param \Shopsys\FrameworkBundle\Component\Domain\Domain $domain
      */
     public function __construct(
         UnitGridFactory $unitGridFactory,
         protected readonly UnitFacade $unitFacade,
         protected readonly FormFactoryInterface $formFactory,
         protected readonly UnitDataFactoryInterface $unitDataFactory,
+        protected readonly Domain $domain,
     ) {
         parent::__construct($unitGridFactory);
     }
@@ -31,6 +35,12 @@ public function __construct(
      */
     protected function createEntityAndGetId($unitData)
     {
+        if (!$this->domain->hasAdminAllDomainsEnabled()) {
+            throw new InvalidFormDataException([
+                t('Creating a record requires all domains to be enabled as domain-specific fields cannot be empty. If you want to proceed, select all domains in the Domain filter in the header first.'),
+            ]);
+        }
+
         $unit = $this->unitFacade->create($unitData);
 
         return $unit->getId();
diff --git a/src/Resources/translations/messages.cs.po b/src/Resources/translations/messages.cs.po
index 29aeed7633..71e84f4424 100644
--- a/src/Resources/translations/messages.cs.po
+++ b/src/Resources/translations/messages.cs.po
@@ -949,6 +949,9 @@ msgstr "Vytvořeno administrátorem"
 msgid "Created on"
 msgstr "Vytvořeno dne"
 
+msgid "Creating a record requires all domains to be enabled as domain-specific fields cannot be empty. If you want to proceed, select all domains in the Domain filter in the header first."
+msgstr "Vytvoření záznamu vyžaduje, aby byly povoleny všechny domény, protože pole specifická pro doménu nemohou být prázdná. Pokud chcete pokračovat, nejprve vyberte všechny domény ve filtru domény v záhlaví."
+
 msgid "Creation date"
 msgstr "Datum vytvoření"
 
@@ -4521,3 +4524,4 @@ msgstr "{1} Byl vytvořen <strong>%count%</strong> slevový kupón|[2,4] Byly vy
 
 msgid "{1}Sales representative \"%label%\" is assigned to %count% customer and will be removed if you proceed.<br><br> Customer:<br> %customersEnumeration%<br><br> Do you really want to remove sales representative \"%label%\" permanently? |[2,10]Sales representative \"%label%\" is assigned to %count% customers and will be removed if you proceed.<br><br> Customers:<br> %customersEnumeration%<br><br> Do you really want to remove sales representative \"%label%\" permanently? |[11,Inf]Sales representative \"%label%\" is assigned to %count% customers and will be removed if you proceed.<br><br> Customers:<br> %customersEnumeration%<br> +%extraCount% more<br><br> Do you really want to remove sales representative \"%label%\" permanently?"
 msgstr "{1}Obchodní zástupce \"%label%\" je přiřazen k %count% zákazníkovi a bude odstraněn, pokud budete pokračovat.<br><br>Zákazník:<br>%customersEnumeration%<br><br>Opravdu chcete obchodního zástupce \"%label%\" trvale odstranit?|[2,10]Obchodní zástupce \"%label%\" je přiřazen k %count% zákazníkům a bude odstraněn, pokud budete pokračovat.<br><br>Zákazníci:<br>%customersEnumeration%<br><br>Opravdu chcete obchodního zástupce \"%label%\" trvale odstranit?|[11,14]Obchodní zástupce \"%label%\" je přiřazen k %count% zákazníkům a bude odstraněn, pokud budete pokračovat.<br><br>Zákazníci:<br>%customersEnumeration%<br>+%extraCount% další<br><br>Opravdu chcete obchodního zástupce \"%label%\" trvale odstranit?|[15,Inf]Obchodní zástupce \"%label%\" je přiřazen k %count% zákazníkům a bude odstraněn, pokud budete pokračovat.<br><br>Zákazníci:<br>%customersEnumeration%<br>+%extraCount% dalších<br><br>Opravdu chcete obchodního zástupce \"%label%\" trvale odstranit?"
+
diff --git a/src/Resources/translations/messages.en.po b/src/Resources/translations/messages.en.po
index 7253c7bbc1..8074f21f62 100644
--- a/src/Resources/translations/messages.en.po
+++ b/src/Resources/translations/messages.en.po
@@ -949,6 +949,9 @@ msgstr ""
 msgid "Created on"
 msgstr ""
 
+msgid "Creating a record requires all domains to be enabled as domain-specific fields cannot be empty. If you want to proceed, select all domains in the Domain filter in the header first."
+msgstr ""
+
 msgid "Creation date"
 msgstr ""
 
@@ -4521,3 +4524,4 @@ msgstr ""
 
 msgid "{1}Sales representative \"%label%\" is assigned to %count% customer and will be removed if you proceed.<br><br> Customer:<br> %customersEnumeration%<br><br> Do you really want to remove sales representative \"%label%\" permanently? |[2,10]Sales representative \"%label%\" is assigned to %count% customers and will be removed if you proceed.<br><br> Customers:<br> %customersEnumeration%<br><br> Do you really want to remove sales representative \"%label%\" permanently? |[11,Inf]Sales representative \"%label%\" is assigned to %count% customers and will be removed if you proceed.<br><br> Customers:<br> %customersEnumeration%<br> +%extraCount% more<br><br> Do you really want to remove sales representative \"%label%\" permanently?"
 msgstr ""
+

From 84b95bf7e8bdb717ffcab31accaa806c8a8fd608 Mon Sep 17 00:00:00 2001
From: Martin Grossmann <martin@vyvoj.net>
Date: Fri, 13 Sep 2024 19:34:20 +0200
Subject: [PATCH 28/32] list of domain now shows only enabled domains

---
 src/Controller/Admin/DomainController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controller/Admin/DomainController.php b/src/Controller/Admin/DomainController.php
index 8153d0988e..159c2f0545 100644
--- a/src/Controller/Admin/DomainController.php
+++ b/src/Controller/Admin/DomainController.php
@@ -158,7 +158,7 @@ protected function loadData()
     {
         $data = [];
 
-        foreach ($this->domain->getAll() as $domainConfig) {
+        foreach ($this->domain->getAdminEnabledDomains() as $domainConfig) {
             $data[] = [
                 'id' => $domainConfig->getId(),
                 'name' => $domainConfig->getName(),

From 19b1c0e846d28cc10085977edad78f791c8b523c Mon Sep 17 00:00:00 2001
From: Martin Grossmann <martin@vyvoj.net>
Date: Fri, 13 Sep 2024 20:38:31 +0200
Subject: [PATCH 29/32] fixed CountryFormType test

---
 .../Form/Admin/Country/CountryFormTypeTest.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/tests/Unit/Form/Admin/Country/CountryFormTypeTest.php b/tests/Unit/Form/Admin/Country/CountryFormTypeTest.php
index 77e221754a..4579c1ca45 100644
--- a/tests/Unit/Form/Admin/Country/CountryFormTypeTest.php
+++ b/tests/Unit/Form/Admin/Country/CountryFormTypeTest.php
@@ -62,13 +62,13 @@ public function testNameIsMandatory(): void
 
         $countryForm = $this->createCountryForm();
         $countryForm->submit($countryFormData);
-        $this->assertTrue($countryForm->isValid());
+        $this->assertTrue($countryForm->isValid(), 'Valid form');
 
         $countryFormData['names']['cs'] = '';
 
         $countryForm = $this->createCountryForm();
         $countryForm->submit($countryFormData);
-        $this->assertFalse($countryForm->isValid());
+        $this->assertFalse($countryForm->isValid(), 'Invalid form - missing czech translation');
     }
 
     public function testPriorityIsNumber(): void
@@ -120,18 +120,22 @@ protected function setUp(): void
 
         $this->localization = $this->createMock(Localization::class);
         $this->localization->method('getLocalesOfAllDomains')->willReturn(['cs', 'en']);
+        $this->localization->method('getAdminEnabledLocales')->willReturn(['cs', 'en']);
         $this->localization->method('getAdminLocale')->willReturn('en');
 
         $this->domain = $this->createMock(Domain::class);
 
         $defaultTimeZone = new DateTimeZone('Europe/Prague');
 
-        $this->domain->method('getAll')
-            ->willReturn([
-                new DomainConfig(Domain::FIRST_DOMAIN_ID, '', '', 'cs', $defaultTimeZone),
-                new DomainConfig(Domain::SECOND_DOMAIN_ID, '', '', 'en', $defaultTimeZone),
-            ]);
+        $domainConfigs = [
+            new DomainConfig(Domain::FIRST_DOMAIN_ID, '', '', 'cs', $defaultTimeZone),
+            new DomainConfig(Domain::SECOND_DOMAIN_ID, '', '', 'en', $defaultTimeZone),
+        ];
+
+        $this->domain->method('getAll')->willReturn($domainConfigs);
         $this->domain->method('getAllIds')->willReturn([1, 2]);
+        $this->domain->method('getAdminEnabledDomainIds')->willReturn([1, 2]);
+        $this->domain->method('getAdminEnabledDomains')->willReturn($domainConfigs);
 
         $countryData = new CountryData();
         $countryData->code = 'UZ';

From 8abdc190cd765a333aba4da7570ddaf66e23302b Mon Sep 17 00:00:00 2001
From: Martin Grossmann <martin@vyvoj.net>
Date: Sat, 19 Oct 2024 23:48:43 +0200
Subject: [PATCH 30/32] transport and payment form do not require any language
 entered

- default enabled value while creating transport/payment is now false
---
 src/Form/Admin/Payment/PaymentFormType.php    | 10 +++--
 .../Admin/Transport/TransportFormType.php     |  9 +++--
 src/Model/Payment/PaymentDataFactory.php      |  2 +-
 src/Model/Transport/TransportDataFactory.php  |  2 +-
 src/Resources/translations/messages.cs.po     |  3 ++
 src/Resources/translations/messages.en.po     |  3 ++
 .../Admin/Content/Payment/listGrid.html.twig  |  4 +-
 .../Content/Transport/listGrid.html.twig      |  2 +-
 src/Twig/NameFallbackExtension.php            | 39 +++++++++++++++++++
 9 files changed, 61 insertions(+), 13 deletions(-)
 create mode 100644 src/Twig/NameFallbackExtension.php

diff --git a/src/Form/Admin/Payment/PaymentFormType.php b/src/Form/Admin/Payment/PaymentFormType.php
index 4d5bae6571..e239c9441a 100644
--- a/src/Form/Admin/Payment/PaymentFormType.php
+++ b/src/Form/Admin/Payment/PaymentFormType.php
@@ -20,6 +20,7 @@
 use Shopsys\FrameworkBundle\Model\Payment\Payment;
 use Shopsys\FrameworkBundle\Model\Payment\PaymentData;
 use Shopsys\FrameworkBundle\Model\Payment\PaymentFacade;
+use Shopsys\FrameworkBundle\Model\Transport\Transport;
 use Shopsys\FrameworkBundle\Model\Transport\TransportFacade;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
@@ -68,10 +69,9 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
 
         $builderBasicInformationGroup
             ->add('name', LocalizedType::class, [
-                'main_constraints' => [
-                    new Constraints\NotBlank(['message' => 'Please enter name']),
-                ],
+                'required' => false,
                 'entry_options' => [
+                    'required' => false,
                     'constraints' => [
                         new Constraints\Length(
                             ['max' => 255, 'maxMessage' => 'Name cannot be longer than {{ limit }} characters'],
@@ -90,7 +90,9 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             ->add('transports', ChoiceType::class, [
                 'required' => false,
                 'choices' => $this->transportFacade->getAll(),
-                'choice_label' => 'name',
+                'choice_label' => function (Transport $transport) {
+                    return $transport->getName() ?? t('Name in default language is not entered') . ' (ID: ' . $transport->getId() . ')';
+                },
                 'choice_value' => 'id',
                 'multiple' => true,
                 'expanded' => true,
diff --git a/src/Form/Admin/Transport/TransportFormType.php b/src/Form/Admin/Transport/TransportFormType.php
index 70f4f14522..2f2dba30ef 100644
--- a/src/Form/Admin/Transport/TransportFormType.php
+++ b/src/Form/Admin/Transport/TransportFormType.php
@@ -18,6 +18,7 @@
 use Shopsys\FrameworkBundle\Form\Locale\LocalizedType;
 use Shopsys\FrameworkBundle\Form\TransportInputPricesType;
 use Shopsys\FrameworkBundle\Model\Order\Mail\OrderMail;
+use Shopsys\FrameworkBundle\Model\Payment\Payment;
 use Shopsys\FrameworkBundle\Model\Payment\PaymentFacade;
 use Shopsys\FrameworkBundle\Model\Transport\Transport;
 use Shopsys\FrameworkBundle\Model\Transport\TransportData;
@@ -71,9 +72,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         }
         $builderBasicInformationGroup
             ->add('name', LocalizedType::class, [
-                'main_constraints' => [
-                    new Constraints\NotBlank(['message' => 'Please enter name']),
-                ],
+                'required' => false,
                 'entry_options' => [
                     'required' => false,
                     'constraints' => [
@@ -95,7 +94,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('payments', ChoiceType::class, [
                 'required' => false,
                 'choices' => $this->paymentFacade->getAll(),
-                'choice_label' => 'name',
+                'choice_label' => function (Payment $payment) {
+                    return $payment->getName() ?? t('Name in default language is not entered') . ' (ID: ' . $payment->getId() . ')';
+                },
                 'choice_value' => 'id',
                 'multiple' => true,
                 'expanded' => true,
diff --git a/src/Model/Payment/PaymentDataFactory.php b/src/Model/Payment/PaymentDataFactory.php
index 7e44c53a4a..3e26fcbcd5 100644
--- a/src/Model/Payment/PaymentDataFactory.php
+++ b/src/Model/Payment/PaymentDataFactory.php
@@ -48,7 +48,7 @@ public function create(): PaymentData
     protected function fillNew(PaymentData $paymentData): void
     {
         foreach ($this->domain->getAllIds() as $domainId) {
-            $paymentData->enabled[$domainId] = true;
+            $paymentData->enabled[$domainId] = false;
             $paymentData->pricesIndexedByDomainId[$domainId] = Money::zero();
             $paymentData->vatsIndexedByDomainId[$domainId] = $this->vatFacade->getDefaultVatForDomain($domainId);
             $paymentData->goPayPaymentMethodByDomainId[$domainId] = null;
diff --git a/src/Model/Transport/TransportDataFactory.php b/src/Model/Transport/TransportDataFactory.php
index a7e0e8b95d..12954e6f95 100644
--- a/src/Model/Transport/TransportDataFactory.php
+++ b/src/Model/Transport/TransportDataFactory.php
@@ -54,7 +54,7 @@ protected function fillNew(TransportData $transportData): void
         $transportData->daysUntilDelivery = 0;
 
         foreach ($this->domain->getAllIds() as $domainId) {
-            $transportData->enabled[$domainId] = true;
+            $transportData->enabled[$domainId] = false;
             $transportData->inputPricesByDomain[$domainId] = $this->transportInputPricesDataFactory->create($domainId);
         }
 
diff --git a/src/Resources/translations/messages.cs.po b/src/Resources/translations/messages.cs.po
index 71e84f4424..cdd9bfbec6 100644
--- a/src/Resources/translations/messages.cs.po
+++ b/src/Resources/translations/messages.cs.po
@@ -2422,6 +2422,9 @@ msgstr "Název"
 msgid "Name %locale%"
 msgstr "Název %locale%"
 
+msgid "Name in default language is not entered"
+msgstr "Název ve výchozím jazyce není vyplněn"
+
 msgid "Name in the corresponding locale must be filled-in in order to display the file on the storefront"
 msgstr "Pro zobrazení souboru na doméně musí být vyplněn název v odpovídajícím jazyce"
 
diff --git a/src/Resources/translations/messages.en.po b/src/Resources/translations/messages.en.po
index 8074f21f62..17fbd3ca87 100644
--- a/src/Resources/translations/messages.en.po
+++ b/src/Resources/translations/messages.en.po
@@ -2422,6 +2422,9 @@ msgstr ""
 msgid "Name %locale%"
 msgstr ""
 
+msgid "Name in default language is not entered"
+msgstr ""
+
 msgid "Name in the corresponding locale must be filled-in in order to display the file on the storefront"
 msgstr ""
 
diff --git a/src/Resources/views/Admin/Content/Payment/listGrid.html.twig b/src/Resources/views/Admin/Content/Payment/listGrid.html.twig
index e267206ebb..03434fa55a 100644
--- a/src/Resources/views/Admin/Content/Payment/listGrid.html.twig
+++ b/src/Resources/views/Admin/Content/Payment/listGrid.html.twig
@@ -1,9 +1,9 @@
 {% extends '@ShopsysFramework/Admin/Grid/Grid.html.twig' %}
 
 {% block grid_value_cell_id_name %}
-    <a href="{{ url('admin_payment_edit', { id: row.p.id }) }}">{{ value }}</a>
+    <a href="{{ url('admin_payment_edit', { id: row.p.id }) }}">{{ value|nameWithFallbackOnEmpty }}</a>
 {% endblock %}
 
 {% block grid_no_data %}
     {{ 'No payments created so far.'|trans }}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/src/Resources/views/Admin/Content/Transport/listGrid.html.twig b/src/Resources/views/Admin/Content/Transport/listGrid.html.twig
index ecaac67dfe..1e674c8990 100644
--- a/src/Resources/views/Admin/Content/Transport/listGrid.html.twig
+++ b/src/Resources/views/Admin/Content/Transport/listGrid.html.twig
@@ -1,7 +1,7 @@
 {% extends '@ShopsysFramework/Admin/Grid/Grid.html.twig' %}
 
 {% block grid_value_cell_id_name %}
-    <a href="{{ url('admin_transport_edit', { id: row.t.id }) }}">{{ value }}</a>
+    <a href="{{ url('admin_transport_edit', { id: row.t.id }) }}">{{ value|nameWithFallbackOnEmpty() }}</a>
 {% endblock %}
 
 {% block grid_value_cell_id_prices %}
diff --git a/src/Twig/NameFallbackExtension.php b/src/Twig/NameFallbackExtension.php
new file mode 100644
index 0000000000..87311820d6
--- /dev/null
+++ b/src/Twig/NameFallbackExtension.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shopsys\FrameworkBundle\Twig;
+
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFilter;
+
+class NameFallbackExtension extends AbstractExtension
+{
+    /**
+     * @return \Twig\TwigFilter[]
+     */
+    public function getFilters(): array
+    {
+        return [
+            new TwigFilter('nameWithFallbackOnEmpty', $this->getNameWithFallbackOnEmpty(...)),
+        ];
+    }
+
+    /**
+     * @param string|null $value
+     * @param string|null $fallbackValue
+     * @return string
+     */
+    public function getNameWithFallbackOnEmpty(?string $value, ?string $fallbackValue = null): string
+    {
+        if ($value === null || $value === '') {
+            $value = $fallbackValue;
+        }
+
+        if ($value === null || $value === '') {
+            return t('Name in default language is not entered');
+        }
+
+        return $value;
+    }
+}

From eebf4649230b8d4339768c93b56af03aea99eb53 Mon Sep 17 00:00:00 2001
From: Martin Grossmann <martin@vyvoj.net>
Date: Mon, 4 Nov 2024 14:45:48 +0100
Subject: [PATCH 31/32] inquiries are now displayed only for managed domains

---
 src/Controller/Admin/InquiryController.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Controller/Admin/InquiryController.php b/src/Controller/Admin/InquiryController.php
index b4c00b4eb1..84db338543 100644
--- a/src/Controller/Admin/InquiryController.php
+++ b/src/Controller/Admin/InquiryController.php
@@ -5,6 +5,7 @@
 namespace Shopsys\FrameworkBundle\Controller\Admin;
 
 use Shopsys\FrameworkBundle\Component\Domain\AdminDomainFilterTabsFacade;
+use Shopsys\FrameworkBundle\Component\Domain\Domain;
 use Shopsys\FrameworkBundle\Form\Admin\QuickSearch\QuickSearchFormData;
 use Shopsys\FrameworkBundle\Form\Admin\QuickSearch\QuickSearchFormType;
 use Shopsys\FrameworkBundle\Model\Inquiry\InquiryFacade;
@@ -21,12 +22,14 @@ class InquiryController extends AdminBaseController
      * @param \Shopsys\FrameworkBundle\Model\Inquiry\InquiryFacade $inquiryFacade
      * @param \Shopsys\FrameworkBundle\Model\Localization\Localization $localization
      * @param \Shopsys\FrameworkBundle\Component\Domain\AdminDomainFilterTabsFacade $adminDomainFilterTabsFacade
+     * @param \Shopsys\FrameworkBundle\Component\Domain\Domain $domain
      */
     public function __construct(
         protected readonly InquiryGridFactory $inquiryGridFactory,
         protected readonly InquiryFacade $inquiryFacade,
         protected readonly Localization $localization,
         protected readonly AdminDomainFilterTabsFacade $adminDomainFilterTabsFacade,
+        protected readonly Domain $domain,
     ) {
     }
 
@@ -53,6 +56,10 @@ public function listAction(Request $request): Response
             $queryBuilder
                 ->andWhere('i.domainId = :selectedDomainId')
                 ->setParameter('selectedDomainId', $selectedDomainId);
+        } else {
+            $queryBuilder
+                ->andWhere('i.domainId IN (:domainIds)')
+                ->setParameter('domainIds', $this->domain->getAdminEnabledDomainIds());
         }
 
         return $this->render('@ShopsysFramework/Admin/Content/Inquiry/list.html.twig', [

From a92d3ede5642423c0a095cd140dfe2d47a66fd07 Mon Sep 17 00:00:00 2001
From: Martin Grossmann <martin@vyvoj.net>
Date: Wed, 6 Nov 2024 09:24:07 +0100
Subject: [PATCH 32/32] fixed select domain with limited role

---
 src/Controller/Admin/SelectAdminDomainsController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controller/Admin/SelectAdminDomainsController.php b/src/Controller/Admin/SelectAdminDomainsController.php
index 97024dfe22..99d75bc2d6 100644
--- a/src/Controller/Admin/SelectAdminDomainsController.php
+++ b/src/Controller/Admin/SelectAdminDomainsController.php
@@ -41,7 +41,7 @@ public function renderFormAction(): Response
      * @param \Symfony\Component\HttpFoundation\Request $request
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    #[Route('/admin/domains/filter', name: 'admin_domains_filter', methods: ['POST'])]
+    #[Route('/domains/filter', name: 'admin_domains_filter', methods: ['POST'])]
     public function filterDomainsAction(Request $request): Response
     {
         $form = $this->createForm(AdminDomainsFormType::class);