Correctif mineur

Builder/User/UserMerchantBuilder.php

 
             $this->entityManager->create($userMerchant);
             $this->entityManager->flush();
+        }elseif(!$userMerchant->getActive()){
+            $userMerchant->setActive(true);
+            $this->entityManager->update($userMerchant);
+            $this->entityManager->flush();
         }
 
         return $userMerchant;

Resources/views/admin/order/field/delivery_type.html.twig

-{{ 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 %}