Bläddra i källkod

Merge branch 'develop'

master
Guillaume Bourgeois 1 år sedan
förälder
incheckning
ca653018a6
2 ändrade filer med 7 tillägg och 5 borttagningar
  1. +6
    -4
      backend/controllers/UserController.php
  2. +1
    -1
      common/logic/User/UserProducer/Repository/UserProducerRepository.php

+ 6
- 4
backend/controllers/UserController.php Visa fil

@@ -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;

+ 1
- 1
common/logic/User/UserProducer/Repository/UserProducerRepository.php Visa fil

@@ -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)

Laddar…
Avbryt
Spara