From: Raphaël Gertz <git@rapsys.eu>
Date: Tue, 4 Oct 2022 07:53:54 +0000 (+0200)
Subject: Add country, city and zipcode member
X-Git-Tag: 0.3.0~212
X-Git-Url: https://git.rapsys.eu/airbundle/commitdiff_plain/8b1da3957891754cde261e74aa0ad8c046651b6a

Add country, city and zipcode member
Drop slug member
---

diff --git a/Form/RegisterType.php b/Form/RegisterType.php
index 0e0395f..06e5f36 100644
--- a/Form/RegisterType.php
+++ b/Form/RegisterType.php
@@ -11,12 +11,17 @@
 
 namespace Rapsys\AirBundle\Form;
 
-use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\Extension\Core\Type\TelType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
-class RegisterType extends \Rapsys\UserBundle\Form\RegisterType {
+use Rapsys\AirBundle\Entity\Country;
+
+use Rapsys\UserBundle\Form\RegisterType as BaseRegisterType;
+
+class RegisterType extends BaseRegisterType {
 	/**
 	 * {@inheritdoc}
 	 */
@@ -24,6 +29,17 @@ class RegisterType extends \Rapsys\UserBundle\Form\RegisterType {
 		//Call parent build form
 		$form = parent::buildForm($builder, $options);
 
+		//Add extra city field
+		if (!empty($options['city'])) {
+			$form->add('city', TextType::class, ['attr' => ['placeholder' => 'Your city'], 'required' => false]);
+		}
+
+		//Add extra country field
+		if (!empty($options['country'])) {
+			//Add country field
+			$form->add('country', EntityType::class, ['class' => $options['country_class'], 'choice_label' => 'title'/*, 'choices' => $options['location_choices']*/, 'preferred_choices' => $options['country_favorites'], 'attr' => ['placeholder' => 'Your country'], 'choice_translation_domain' => false, 'required' => true, 'data' => $options['country_default']]);
+		}
+
 		//Add extra phone field
 		if (!empty($options['phone'])) {
 			$form->add('phone', TelType::class, ['attr' => ['placeholder' => 'Your phone'], 'required' => false]);
@@ -34,9 +50,9 @@ class RegisterType extends \Rapsys\UserBundle\Form\RegisterType {
 			$form->add('pseudonym', TextType::class, ['attr' => ['placeholder' => 'Your pseudonym'], 'required' => false]);
 		}
 
-		//Add extra slug field
-		if (!empty($options['slug'])) {
-			$form->add('slug', TextType::class, ['attr' => ['placeholder' => 'Your slug'], 'required' => false]);
+		//Add extra zipcode field
+		if (!empty($options['zipcode'])) {
+			$form->add('zipcode', TextType::class, ['attr' => ['placeholder' => 'Your zipcode'], 'required' => false]);
 		}
 
 		//Return form
@@ -51,7 +67,22 @@ class RegisterType extends \Rapsys\UserBundle\Form\RegisterType {
 		parent::configureOptions($resolver);
 
 		//Set defaults
-		$resolver->setDefaults(['phone' => true, 'pseudonym' => true, 'slug' => true]);
+		$resolver->setDefaults(['city' => true, 'country' => true, 'country_class' => 'RapsysAirBundle:Country', 'country_default' => null, 'country_favorites' => [], 'phone' => true, 'pseudonym' => true, 'zipcode' => true]);
+
+		//Add extra city option
+		$resolver->setAllowedTypes('city', 'boolean');
+
+		//Add extra country option
+		$resolver->setAllowedTypes('country', 'boolean');
+
+		//Add country class
+		$resolver->setAllowedTypes('country_class', 'string');
+
+		//Add country default
+		$resolver->setAllowedTypes('country_default', [Country::class, 'null']);
+
+		//Add country favorites
+		$resolver->setAllowedTypes('country_favorites', 'array');
 
 		//Add extra phone option
 		$resolver->setAllowedTypes('phone', 'boolean');
@@ -59,8 +90,8 @@ class RegisterType extends \Rapsys\UserBundle\Form\RegisterType {
 		//Add extra pseudonym option
 		$resolver->setAllowedTypes('pseudonym', 'boolean');
 
-		//Add extra slug option
-		$resolver->setAllowedTypes('slug', 'boolean');
+		//Add extra zipcode option
+		$resolver->setAllowedTypes('zipcode', 'boolean');
 	}