Evolution #598: Inscription: newsletter / pubs

app/Resources/translations/userform.fr.yml

@@ -9,6 +9,9 @@ password:
   first:   Mot de passe
   second:  Mot de passe (vérification)
 token:     Code d'inscription
+mail_newsletter:  Je souhaite recevoir des emails de la part de Muzi.ch
+mail_partner:     Je souhaite recevoir des emails de la part de partenaires de Muzi.ch (Ce service n'est pas actif pas pour le moment)
+cgu_accepted:     J'ai lu et j'accepete les <a href="%url%">condition générales d'utilisation de Muzi.ch</a>
 
 help:
   token:   |

app/Resources/translations/userui.fr.yml

@@ -65,6 +65,11 @@ my_account:
     help:           'Choisissez une image puis préssez le bouton "Mettre à jour"'
     success:        Votre avatar a bien été mis à jour
     error:          Une erreur est survenue lors de la mise à jour de votre avatar
+  preferences:
+    title:         Mes préférences
+    submit:         Enregistrer mes préférences
+    success:        Vos préférences ont bien été mises à jour
+    error:          Une erreur est survenue lors de la mise à jour de vos préférences
   
 connexion:
   password_lost:    Mot de passe perdu ?

src/Muzich/CoreBundle/Entity/User.php

@@ -232,6 +232,25 @@ class User extends BaseUser
   private $help_tour;
   
   /**
+   * @ORM\Column(type="boolean")
+   * @Assert\NotBlank()
+   * @var type boolean
+   */
+  public $cgu_accepted = false;
+  
+  /**
+   * @ORM\Column(type="boolean")
+   * @var type boolean
+   */
+  public $mail_newsletter = true;
+  
+  /**
+   * @ORM\Column(type="boolean")
+   * @var type boolean
+   */
+  public $mail_partner = true;
+  
+  /**
    * 
    */
   public function __construct()

src/Muzich/UserBundle/Controller/UserController.php

@@ -31,6 +31,31 @@ class UserController extends Controller
     ;
   }
   
+  protected function getPreferencesForm()
+  {
+    /**
+     * Bug lors des tests: L'user n'est pas 'lié' a celui en base par doctrine.
+     * Docrine le voit si on faire une requete directe.
+     */
+    if ($this->container->getParameter('env') == 'test')
+    {
+      $user = $this->getDoctrine()->getRepository('MuzichCoreBundle:User')->findOneById(
+        $this->container->get('security.context')->getToken()->getUser()->getId(),
+        array()
+      )->getSingleResult();
+    }
+    else
+    {
+      $user = $this->getUser();
+    }
+     
+    return $this->createFormBuilder($user)
+      ->add('mail_newsletter', 'checkbox', array('required' => false))
+      ->add('mail_partner', 'checkbox', array('required' => false))
+      ->getForm()
+    ;
+  }
+  
   protected function getTagsFavoritesForm($user)
   {
     $ids = array();
@@ -90,7 +115,8 @@ class UserController extends Controller
       'form_tags_favorites_name' => $form_tags_favorites->getName(),
       'favorite_tags_id'         => $this->getTagsFavorites(),
       'change_email_form'        => $change_email_form->createView(),
-      'avatar_form'              => $this->getAvatarForm()->createView()
+      'avatar_form'              => $this->getAvatarForm()->createView(),
+      'preferences_form'         => $this->getPreferencesForm()->createView()
     );
   }
   
@@ -606,4 +632,24 @@ class UserController extends Controller
     return $this->redirect($this->generateUrl('my_account'));
   }
   
+  public function updatePreferencesAction(Request $request)
+  {
+    $form = $this->getPreferencesForm();
+    $form->bindRequest($request);
+    
+    if ($form->isValid()) {
+      $em = $this->getEntityManager();
+      $em->persist($form->getData());
+      $em->flush();
+
+      $this->setFlash('success',
+        $this->trans('my_account.preferences.success', array(), 'userui'));
+      return $this->redirect($this->generateUrl('my_account'));
+    }
+    
+    $this->setFlash('error',
+      $this->trans('my_account.preferences.error', array(), 'userui'));
+    return $this->redirect($this->generateUrl('my_account'));
+  }
+  
 }

src/Muzich/UserBundle/DataFixtures/ORM/LoadUserData.php

@@ -48,6 +48,7 @@ class LoadUserData extends AbstractFixture implements OrderedFixtureInterface, C
     
     $user->setPlainPassword($password_raw);
     $user->setEnabled($enabled);
+    $user->cgu_accepted = true;
     $this->user_manager->updatePassword($user);
     
     $this->user_manager->updateUser($user, false);

src/Muzich/UserBundle/Form/Type/RegistrationFormType.php

@@ -15,6 +15,18 @@ class RegistrationFormType extends BaseType
       "property_path" => false
     ));
     
+    $builder->add('cgu_accepted', 'checkbox', array(
+      'required'  => true
+    ));
+
+    $builder->add('mail_newsletter', 'checkbox', array(
+      'required'  => false
+    ));
+
+    $builder->add('mail_partner', 'checkbox', array(
+      'required'  => false
+    ));
+    
   }
 
   public function getName()

src/Muzich/UserBundle/Resources/config/routing.yml

@@ -1,5 +1,3 @@
-
-
 my_account:
   pattern:  /account
   defaults: { _controller: MuzichUserBundle:User:account }
@@ -50,3 +48,10 @@ user_update_avatar:
   defaults: { _controller: MuzichUserBundle:User:updateAvatar }
   requirements:
     _method:  POST
+
+user_update_preferences:
+  pattern:  /account/update-preferences
+  defaults: { _controller: MuzichUserBundle:User:updatePreferences }
+  requirements:
+    _method:  POST
+  

src/Muzich/UserBundle/Resources/views/Registration/register.html.twig

@@ -46,6 +46,29 @@
       {{ form_errors(form.token) }}
       {{ form_label(form.token, 'token'|trans({}, 'userform')) }}
       {{ form_widget(form.token, {'attr':{'class':'niceinput'}}) }}
+    </div>
+    
+    <div class="field">
+      {{ form_errors(form.cgu_accepted) }}
+      {{ form_label(form.cgu_accepted, '') }}
+      {{ form_widget(form.cgu_accepted, {'attr':{}}) }}
+      {% autoescape false %}
+      {{ 'cgu_accepted'|trans({'%url%':path('info_cgu')}, 'userform') }}
+      {% endautoescape %}
+    </div>
+    
+    <div class="field">
+      {{ form_errors(form.mail_newsletter) }}
+      {{ form_label(form.mail_newsletter, '') }}
+      {{ form_widget(form.mail_newsletter, {'attr':{}}) }}
+      {{ 'mail_newsletter'|trans({}, 'userform') }}
+    </div>
+    
+    <div class="field">
+      {{ form_errors(form.mail_partner) }}
+      {{ form_label(form.mail_partner, '') }}
+      {{ form_widget(form.mail_partner, {'attr':{}}) }}
+      {{ 'mail_partner'|trans({}, 'userform') }}
     </div> 
 
     {{ form_rest(form) }}

src/Muzich/UserBundle/Resources/views/User/account.html.twig

@@ -102,5 +102,24 @@
       </form>
     </div>
     
+    <h2 data-open="myaccount_preferences">{{ 'my_account.preferences.title'|trans({}, 'userui') }}</h2>
+  
+    <div id="myaccount_preferences" class="myaccount_part"
+       style="display: none;"
+    >
+      <form
+          action="{{ path('user_update_preferences') }}"
+          method="post"
+        >
+        
+          {% include "MuzichUserBundle:User:preference_form.html.twig" with { 
+            'form': preferences_form
+          } %}
+      
+          <input type="submit" class="button" value="{{ 'my_account.preferences.submit'|trans({}, 'userui') }}" />
+      </form>
+    </div>
+    <div style="clear:both;"></div>
+    
   </div>
 {% endblock %}

src/Muzich/UserBundle/Resources/views/User/preference_form.html.twig

@@ -0,0 +1,16 @@
+
+<div class="field">
+  {{ form_errors(form.mail_newsletter) }}
+  {{ form_label(form.mail_newsletter, '') }}
+  {{ form_widget(form.mail_newsletter, {'attr':{}}) }}
+  {{ 'mail_newsletter'|trans({}, 'userform') }}
+</div>
+
+<div class="field">
+  {{ form_errors(form.mail_partner) }}
+  {{ form_label(form.mail_partner, '') }}
+  {{ form_widget(form.mail_partner, {'attr':{}}) }}
+  {{ 'mail_partner'|trans({}, 'userform') }}
+</div> 
+
+{{ form_rest(form) }}

web/css/main.css

@@ -1674,4 +1674,11 @@ div#presubscription input[type="submit"]
 ul.element_thumb_actions li.score
 {
   color: black;
+}
+
+div#myaccount_preferences input[type="submit"]
+{
+  float: right;
+  margin-right: 7px;
+  margin-top: 5px;
 }