Merge branch 'develop'

backend/controllers/UserController.php

@@ -307,15 +307,17 @@ class UserController extends BackendController
     public function processLinkPointSale(User $modelUser)
     {
         $posts = Yii::$app->request->post();
+        $userPointSaleManager = $this->getUserPointSaleManager();
+        $pointSaleManager = $this->getPointSaleManager();
+
         UserPointSale::deleteAll([
             'id_user' => $modelUser->id
         ]);
         if (is_array($modelUser->points_sale) && count($modelUser->points_sale) > 0) {
             foreach ($modelUser->points_sale as $pointSaleId) {
-                $userPointSale = UserPointSale::searchOne([
-                    'id_user' => $modelUser->id,
-                    'id_point_sale' => $pointSaleId
-                ]);
+                $pointSale = $pointSaleManager->findOnePointSaleById($pointSaleId);
+                $userPointSale = $userPointSaleManager->findOneUserPointSale($modelUser, $pointSale);
+
                 if (!$userPointSale) {
                     $userPointSale = new UserPointSale;
                     $userPointSale->id_user = $modelUser->id;

common/logic/User/UserProducer/Repository/UserProducerRepository.php

@@ -35,7 +35,7 @@ class UserProducerRepository extends AbstractRepository
 
     public function findUserProducersByUser(User $user, bool $active = true, bool $bookmark = true)
     {
-        return $this->createDefaultQuery()
+        return $this->createQuery()
             ->filterByUser($user)
             ->filterByActive($active)
             ->filterByBookmark($bookmark)