@@ -35,6 +35,10 @@ class UserMerchantBuilder | |||
$this->entityManager->create($userMerchant); | |||
$this->entityManager->flush(); | |||
}elseif(!$userMerchant->getActive()){ | |||
$userMerchant->setActive(true); | |||
$this->entityManager->update($userMerchant); | |||
$this->entityManager->flush(); | |||
} | |||
return $userMerchant; |
@@ -1 +1,5 @@ | |||
{{ field.value|sov_trans_admin_choice('deliveryType', 'OrderShop') }} | |||
{% if field.value is not null %} | |||
{{ field.value|sov_trans_admin_choice('deliveryType', 'OrderShop') }} | |||
{% else %} | |||
Pas de livraison | |||
{% endif %} |