Merge branch 'dev'

backend/controllers/DistributionController.php

@@ -392,7 +392,7 @@ class DistributionController extends BackendController
             'distribution.date' => $date,
         ],
         [
-            'orderby' => 'comment_point_sale ASC, user.name ASC',
+            'orderby' => 'user.lastname ASC, user.name ASC, comment_point_sale ASC',
             'conditions' => 'date_delete IS NULL'
         ]) ;
         
@@ -593,7 +593,7 @@ class DistributionController extends BackendController
                 'distribution.id_producer' => $idProducer
             ],
             [
-                'orderby' => 'comment_point_sale ASC, user.name ASC',
+                'orderby' => 'user.lastname ASC, user.name ASC, comment_point_sale ASC',
                 'conditions' => 'date_delete IS NULL'
             ]) ;
 

common/models/User.php

@@ -98,7 +98,7 @@ class User extends ActiveRecordCommon implements IdentityInterface
         return [
             [['no_mail', 'mail_distribution_monday', 'mail_distribution_tuesday', 'mail_distribution_wednesday', 'mail_distribution_thursday', 'mail_distribution_friday', 'mail_distribution_saturday', 'mail_distribution_sunday'], 'boolean'],
             [['lastname', 'name', 'phone', 'address'], 'string'],
-            [['lastname', 'name'], 'required', 'message' => 'Ce champs ne peut être vide'],
+            [['lastname'], 'required', 'message' => 'Ce champs ne peut être vide'],
             ['email', 'email', 'message' => 'Cette adresse email n\'est pas valide'],
             ['email', 'verifyEmail'],
             ['status', 'default', 'value' => self::STATUS_ACTIVE],