diff --git a/Jenkinsfile b/Jenkinsfile index ba3de34..d24f2a7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,5 +9,13 @@ pipeline { sudo su jenkins -c "git stash && git pull origin staging" ''' } } + stage ("deploy to DRL dev ezway") { + when { branch 'releases/release-hytha' } + agent { label 'apache && dev' } + steps { + sh '''cd /var/www/drl-nextcloud/custom_apps + sudo su jenkins -c "git stash && git pull origin releases/release-hytha" ''' + } + } } } diff --git a/gestion/lib/Controller/PageController.php b/gestion/lib/Controller/PageController.php index 879e514..0daa63c 100644 --- a/gestion/lib/Controller/PageController.php +++ b/gestion/lib/Controller/PageController.php @@ -1701,7 +1701,7 @@ class PageController extends Controller { $factures = json_decode($this->myDb->getFactures($this->idNextcloud)); foreach ($factures as $key => $facture) { $facture_temp = array( - 'num' => explode('/',$facture->num)[2], + 'num' => $facture->num, 'client' => $facture->entreprise, 'nom_client' => $facture->nom, 'date' => $facture->date,