Browse Source

Merge branch 'dev'

master
Guillaume Bourgeois 4 years ago
parent
commit
69fdf68777
2 changed files with 3 additions and 3 deletions
  1. +2
    -2
      backend/controllers/DistributionController.php
  2. +1
    -1
      common/models/User.php

+ 2
- 2
backend/controllers/DistributionController.php View File

'distribution.date' => $date, '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' 'conditions' => 'date_delete IS NULL'
]) ; ]) ;
'distribution.id_producer' => $idProducer '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' 'conditions' => 'date_delete IS NULL'
]) ; ]) ;



+ 1
- 1
common/models/User.php View File

return [ 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'], [['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', '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', 'email', 'message' => 'Cette adresse email n\'est pas valide'],
['email', 'verifyEmail'], ['email', 'verifyEmail'],
['status', 'default', 'value' => self::STATUS_ACTIVE], ['status', 'default', 'value' => self::STATUS_ACTIVE],

Loading…
Cancel
Save