Bläddra i källkod

Merge branch 'develop' of https://forge.laclic.fr/Laclic/CaracoleBundle into develop

packProduct
Fabien Normand 3 år sedan
förälder
incheckning
c400e602e8
1 ändrade filer med 23 tillägg och 12 borttagningar
  1. +23
    -12
      Resolver/MerchantResolver.php

+ 23
- 12
Resolver/MerchantResolver.php Visa fil

@@ -142,24 +142,35 @@ class MerchantResolver
$user = $this->security->getUser();
}

$merchants = $this->merchantStore->getOnline();

if ($user) {
return $user->getFavoriteMerchant();
} else {
$merchantCurrentId = $this->requestStack->getCurrentRequest()->cookies->getInt(
$this->parameterBag->get('app.cookie_name_merchant_current')
);
if ($merchantCurrentId) {
foreach ($merchants as $merchant) {
if ($merchant->getId() == $merchantCurrentId) {
return $merchant;
}
}
}
else {
$merchantCurrent = $this->getMerchantUserViaCookie();
if($merchantCurrent) {
return $merchantCurrent;
}
}

return false;
}

public function getMerchantUserViaCookie()
{
$merchants = $this->merchantStore->getOnline();
$merchantCurrentId = $this->requestStack->getCurrentRequest()->cookies->getInt(
$this->parameterBag->get('app.cookie_name_merchant_current')
);

if ($merchantCurrentId) {
foreach ($merchants as $merchant) {
if ($merchant->getId() == $merchantCurrentId) {
return $merchant;
}
}
}

return null;
}

}

Laddar…
Avbryt
Spara