Correctif MerchantResolver

Resolver/MerchantResolver.php

 
 
 use Doctrine\ORM\EntityManagerInterface;
+use Lc\CaracoleBundle\Definition\MerchantSettingDefinition;
+use Lc\CaracoleBundle\Definition\MerchantSettingDefinitionInterface;
 use Lc\CaracoleBundle\Model\Merchant\MerchantInterface;
 use Lc\CaracoleBundle\Model\User\UserMerchantInterface;
 use Lc\CaracoleBundle\Repository\Merchant\MerchantRepository;
             } // distant
             else {
                 foreach ($merchants as $merchant) {
-                    $url = $merchant->getMerchantConfig('url');
+                    $url = $merchant->getMerchantSettingValue(MerchantSettingDefinition::SETTING_URL);
                     if ($url && strlen($url) && strpos($url, $_SERVER['HTTP_HOST']) !== false) {
                         $this->currentMerchant = $merchant;
                     }