Merge branch 'develop'

Repository/Order/OrderShopStore.php

@@ -133,21 +133,6 @@ class OrderShopStore extends AbstractStore
         );
     }
 
-    // getOrderShopsOfWeekByUser
-    //getByCurrentCycleAndUser
-    public function getByCurrentDistributionAndUser(UserInterface $user = null, array $params = [], $query = null)
-    {
-        return $this->getByCurrentDistribution(
-            array_merge(
-                [
-                    'user' => $user,
-                    'excludeComplementaryOrderShops' => true
-                ],
-                $params
-            ),
-            $query
-        );
-    }
 
     //public $countOrderShopsOfWeek = null;
     // public function countByCurrentCycle(bool $excludeComplementaryOrderShops = true, $query = null)
@@ -181,6 +166,35 @@ class OrderShopStore extends AbstractStore
         return $this->countOrderShopsOfWeek;*/
     }
 
+    public function getByCurrentDistributionAndUser(UserInterface $user = null, array $params = [], $query = null)
+    {
+        return $this->getByCurrentDistribution(
+            array_merge(
+                [
+                    'user' => $user,
+                    'excludeComplementaryOrderShops' => true
+                ],
+                $params
+            ),
+            $query
+        );
+    }
+
+    public function countValidByCurrentDistributionAndUser(UserInterface $user = null, array $params = [], $query = null)
+    {
+        return $this->countByCurrentDistribution(
+            array_merge(
+                [
+                    'isValid' => true,
+                    'user' => $user,
+                    'excludeComplementaryOrderShops' => true
+                ],
+                $params
+            ),
+            $query
+        );
+    }
+
     // getNextWeekId
     public function getNextCycleId(Distribution $distribution, $query = null): int
     {

Resources/translations/admin.fr.yaml

@@ -133,8 +133,8 @@ entity:
     label: Règle de taxe
     label_plurial: Règles de taxes
   UserMerchant:
-    label: Utilisateur avec compte prépayé actif
-    label_plurial: Utilisateurs avec comptes prépayés actifs
+    label: Utilisateur
+    label_plurial: Utilisateurs
     fields:
       user:
         email: Email