fix : sendtime + message video + contact_talent

volume/www/website/www/app/Resources/views/admin/company_edit.html.twig

@@ -14,7 +14,28 @@
 {% endblock %}
 
 {% block content %}
-
+    {{ form_start(formUser, {'id': 'formUser'}) }}
+    <div class="row">
+        <div class="col-xs-8">
+            <div class="box box-primary">
+                <div class="box-header">
+                    <h3 class="box-title">Compte utilisateur</h3>
+                </div>
+                <div class="box-body">
+                    {{ form_errors(formUser) }}
+                    {{ form_label(formUser.email, 'Email') }}
+                    {{ form_widget(formUser.email, {'attr': {'class': 'form-control'}}) }}
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-xs-6">
+            <button class="btn btn-success edit-email-user" data-toggle="tooltip" type="submit">Enregistrer</button>
+        </div>
+    </div>
+    {{ form_end(formUser) }}
+    <br/>
     {{ form_start(form) }}
     <div class="row">
         <div class="col-xs-8">
@@ -37,7 +58,6 @@
                     {{ form_row(form.website) }}
                     {{ form_row(form.tagsComma) }}
                     {{ form_row(form.file) }}
-
                 </div>
             </div>
         </div>
@@ -66,3 +86,33 @@
     {{ form_end(form) }}
 
 {% endblock %}
+
+
+{% block javascripts %}
+    <script>
+        $(document).ready(function () {
+            $('[data-toggle="popover"]').popover();
+
+            $(".edit-email-user").confirm({
+                title: "Êtes vous sûr de modifier l'adresse mail de cet utilisateur ?",
+                content: "Si une erreur de saisie est présente, l'utilisateur ne pourra plus recevoir vos mails.",
+                type: 'ored',
+                boxWidth: '30%',
+                useBootstrap: false,
+                buttons: {
+                    confirm: {
+                        text: 'Confirmer',
+                        action: function() {
+                            $("[name='user_company']").submit();
+                            return true;
+                        }
+                    },
+                    cancel: {
+                        text: 'Annuler'
+                    }
+                }
+            });
+        });
+    </script>
+
+{% endblock %}

volume/www/website/www/app/Resources/views/email/contact_talent.html.twig

@@ -16,7 +16,11 @@
         <br/>
         <br/>
         <div style="text-align:center;">
-            <a class="btn btn-default" href="{{ absolute_url(path('talent_ad_detail',{'alias': answer.ad.alias,'id': answer.id })) }}">Visionner la réponse vidéo</a>
+            {% if answer.ad.alias is null %}
+                <a class="btn btn-default" href="{{ absolute_url(path('talent_ad_detail',{'alias': aliasCompany,'id': answer.id })) }}">Visionner la réponse</a>
+            {% else %}
+                <a class="btn btn-default" href="{{ absolute_url(path('talent_ad_detail',{'alias': answer.ad.alias,'id': answer.id })) }}">Visionner la réponse</a>
+            {% endif %}
         </div>
         {% else %}
         <br />
@@ -26,7 +30,11 @@
         <br/>
         <br/>
         <div style="text-align:center;">
-            <a class="btn btn-default" href="{{ absolute_url(path('talent_ad_detail',{'alias': answer.ad.alias,'id': answer.id })) }}">Consulter la réponse</a>
+            {% if answer.ad.alias is null %}
+                <a class="btn btn-default" href="{{ absolute_url(path('talent_ad_detail',{'alias': aliasCompany,'id': answer.id })) }}">Consulter la réponse</a>
+            {% else %}
+                <a class="btn btn-default" href="{{ absolute_url(path('talent_ad_detail',{'alias': answer.ad.alias,'id': answer.id })) }}">Consulter la réponse</a>
+            {% endif %}
         </div>
         {% endif %}
         <br>

volume/www/website/www/app/config/config.yml

@@ -106,7 +106,7 @@ fos_user:
         email:
             template:   email/password_resetting.email.twig
     from_email:
-        address: noreply@talentstube.com
+        address: noreply@talentstube.io
         sender_name: talentstube.com
     service:
         mailer: fos_user.mailer.twig_swift

volume/www/website/www/app/config/services.yml

@@ -15,9 +15,9 @@ services:
         class: AppBundle\Utils\Services\AfterLoginRedirection
         arguments: ['@router']
 
-    #app.ad_searcher:
-    #    class: AppBundle\Utils\Services\AdSearcher
-    #    arguments: ['@fos_elastica.finder.ads.adfr']
+    app.ad_searcher:
+        class: AppBundle\Utils\Services\AdSearcher
+        arguments: ['@fos_elastica.finder.ads.adfr']
     
     app.ad_tags_searcher:
         class: AppBundle\Utils\Services\AdSearcher

volume/www/website/www/src/AppBundle/Controller/AdController.php

@@ -309,8 +309,8 @@ class AdController extends Controller
             } else {
                 $session->remove('contratSearch');
             }
-            //$adSearcher = $this->get('app.ad_searcher');
-            $ads = array();//$adSearcher->process($data);
+            $adSearcher = $this->get('app.ad_searcher');
+            $ads = $adSearcher->process($data);
             if(empty($ads)){
                 $ads = $this->getPublishedAds($promoted);
                 $noResults = true;

volume/www/website/www/src/AppBundle/Controller/Admin/CompanyController.php

@@ -5,6 +5,7 @@ namespace AppBundle\Controller\Admin;
 use AppBundle\Entity\Company;
 use AppBundle\Entity\Product;
 use AppBundle\Form\Admin\CompanyAdminType;
+use AppBundle\Form\Admin\UserCompanyType;
 use AppBundle\Form\TokenAddType;
 use Edeclic\PrestashopBridgeBundle\Event\PrestashopBridgeEvents;
 use Edeclic\PrestashopBridgeBundle\Event\UserEvent;
@@ -36,14 +37,26 @@ class CompanyController extends Controller
         $user = $company->getUsers()->first();
         $form = $this->createForm(CompanyAdminType::class, $company);
         $form->handleRequest($request);
+
+        $formUser = $this->createForm(UserCompanyType::class, $user);
+        $formUser->handleRequest($request);
+
         if ($form->isSubmitted() && $form->isValid()) {
             $companyManager = $this->get('app.company_manager');
             $companyManager->updateCompany($company);
             $event = new UserEvent($user);
             $this->get('event_dispatcher')->dispatch(PrestashopBridgeEvents::USER_PROFIL_EDIT_SUCCESS, $event);
         }
+
+        if ($formUser->isSubmitted() && $formUser->isValid()) {
+            $em = $this->getDoctrine()->getManager();
+            $em->persist($user);
+            $em->flush();
+        }
+
         return $this->render('admin/company_edit.html.twig', array(
             'form' => $form->createView(),
+            'formUser' => $formUser->createView(),
             'company' => $company,
         ));
     }

volume/www/website/www/src/AppBundle/Controller/AnswerController.php

@@ -327,9 +327,11 @@ class AnswerController extends Controller
         if ($answer->getAd() == null) {
             $type = 'spontaneous';
             $title = $answer->getCompany()->getBrandName();
+            $aliasCompany = $answer->getCompany()->getAlias();
         } else {
             $type = 'answer';
             $title = $answer->getAd()->getTitle();
+            $aliasCompany = '';
         }
         $user = $this->getUser();
         $form = $this->createForm(ContactTalentType::class);
@@ -365,6 +367,7 @@ class AnswerController extends Controller
                 'user' => $answer->getUser(),
                 'video' => $message->getVideo(),
                 'message' => $message,
+                'aliasCompany' => $aliasCompany
             ));
 
             $plainView = $this->renderView('email/contact_talent_plain.html.twig', array(

volume/www/website/www/src/AppBundle/Controller/Api/AnswerController.php

@@ -22,6 +22,7 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use JMS\Serializer\SerializationContext;
 use AppBundle\Exception\ResourceValidationException;
 use AppBundle\Exception\UnknownUserException;
+use \DateTime;
 
 class AnswerController extends FOSRestController
 {
@@ -136,21 +137,21 @@ class AnswerController extends FOSRestController
                     $ad = $em->getRepository('AppBundle:Ad')->find($adId);
                     $answer->setAd($ad);
                 }
-
-                $answer->setVideo($video)
-                    ->setCompany($company);
+                $answer ->setVideo($video)
+                        ->setCompany($company)
+                        ->setSendTime(new \DateTime());
 
                 $em->persist($answer);
                 $em->flush();
 
                 $userCompany = $company->getUsers();
 
-                $message = new Message('Candidature', 'Video', $usr, $userCompany{
+                /*$message = new Message('Candidature', 'Video', $usr, $userCompany{
                     0}, 'CONTACT_TALENT', $answer);
                 $message->setVideo($video);
                 $em->persist($message);
-                $em->flush();
-                $status = array('status' => "success", "idAnswer" => $answer->getId(), "idMessage" => $message->getId());
+                $em->flush();*/
+                $status = array('status' => "success", "idAnswer" => $answer->getId()/*, "idMessage" => $message->getId()*/);
             }
         } else {
             $message = 'Vous n\'êtes pas connecté en tant qu\'utilisateur.';

volume/www/website/www/src/AppBundle/Form/Admin/UserCompanyType.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace AppBundle\Form\Admin;
+
+use AppBundle\Entity\User;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class UserCompanyType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->add('email', null, array('required' => true, 'label' => 'Email'));
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults(array(
+            'data_class' => User::class,
+        ));
+    }
+}

volume/www/website/www/web/css/admin.css

@@ -2912,3 +2912,5 @@ a.link-white-underline {
 
 /*Modules
 ---------------------------------------------------*/
+
+/*# sourceMappingURL=admin.css.map */

volume/www/website/www/web/sass/base/_variables.scss

@@ -20,7 +20,7 @@ $grey6 : #999CA2;
 $grey7 : #1E2327;
 
 $orange: #ff9800;
-$orangeNewApp: #ffe600;
+$orangeNewApp: #FFCE00;
 
 $font-1: 'Raleway', sans-serif;
 $font-2: "Varela Round", sans-serif;

volume/www/website/www/web/sass/modules/_search.scss

@@ -121,7 +121,7 @@
 
 .fix-search{
   position: fixed;
-  top: 60px;
+  top: 89px;
   width: 100%;
   -webkit-transition: all 0.5s;
   -moz-transition: all 0.5s;