Parcourir la source

Merge branch 'develop'

master
Guillaume Bourgeois il y a 4 mois
Parent
révision
cba307a24f
1 fichiers modifiés avec 10 ajouts et 5 suppressions
  1. +10
    -5
      producer/controllers/OrderController.php

+ 10
- 5
producer/controllers/OrderController.php Voir le fichier

@@ -817,7 +817,10 @@ class OrderController extends ProducerBaseController
$orderModule = $this->getOrderModule();

$user = GlobalParam::getCurrentUser();
$userProducer = $this->getUserProducerModule()->getRepository()->findOneUserProducer($user);
$userProducer = null;
if($user) {
$userProducer = $this->getUserProducerModule()->getRepository()->findOneUserProducer($user);
}
$pointsSaleArray = PointSale::find();

if ($distribution) {
@@ -913,10 +916,12 @@ class OrderController extends ProducerBaseController
}

// Filtre par accès exclusif aux points de vente
$pointsSaleArray = $this->getUserProducerModule()->getSolver()->filterPointsSaleByExclusiveAccess(
$userProducer,
$pointsSaleArray
);
if($userProducer) {
$pointsSaleArray = $this->getUserProducerModule()->getSolver()->filterPointsSaleByExclusiveAccess(
$userProducer,
$pointsSaleArray
);
}

return $pointsSaleArray;
}

Chargement…
Annuler
Enregistrer