Commit 21f3092e by Damien Moulard

Merge branch '6333-ajout-filtres-territoire-menu-adjerents-et-tresorerie' into 'develop'

6340 et 6341 : add filter on adherents and tresorerie menu only

See merge request cooperatic/kohinos-tav!99
parents 677269b1 f329b0ed
...@@ -539,7 +539,15 @@ class AdherentAdmin extends AbstractAdmin ...@@ -539,7 +539,15 @@ class AdherentAdmin extends AbstractAdmin
; ;
if ($this->getConfigurationPool()->getContainer()->getParameter('tav_env')) { if ($this->getConfigurationPool()->getContainer()->getParameter('tav_env')) {
$datagridMapper->remove('cotisationajour'); $datagridMapper
->remove('cotisationajour');
if($this->getConfigurationPool()->getContainer()->getParameter('household_based_allowance')) {
$datagridMapper->add('geoloc.subterritory', null, [
'label' => 'Territoire',
'advanced_filter' => false,
'show_filter' => true,
]);
}
} }
} }
......
...@@ -69,7 +69,13 @@ class OperationAdherentAdmin extends OperationAdmin ...@@ -69,7 +69,13 @@ class OperationAdherentAdmin extends OperationAdmin
'label' => 'Adherent', 'label' => 'Adherent',
'advanced_filter' => false, 'advanced_filter' => false,
'show_filter' => true, 'show_filter' => true,
]) ]);
; if($this->getConfigurationPool()->getContainer()->getParameter('household_based_allowance')) {
$datagridMapper->add('account.adherent.geoloc.subterritory', null, [
'label' => 'Territoire',
'advanced_filter' => false,
'show_filter' => true,
]);
}
} }
} }
...@@ -46,4 +46,9 @@ class Subterritory ...@@ -46,4 +46,9 @@ class Subterritory
return $this; return $this;
} }
public function __toString(): string
{
return $this->getName();
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment