From 26d39fa911190312aaa0fe263695b7fe373cb114 Mon Sep 17 00:00:00 2001 From: Tiavina Date: Wed, 12 Feb 2025 15:52:21 +0300 Subject: [PATCH 1/3] default app admin id to admin --- gestion/lib/Constants/BddConstant.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gestion/lib/Constants/BddConstant.php b/gestion/lib/Constants/BddConstant.php index 82a3ab7..02ac83c 100644 --- a/gestion/lib/Constants/BddConstant.php +++ b/gestion/lib/Constants/BddConstant.php @@ -8,7 +8,7 @@ abstract class BddConstant const DEFAULT_TABLE_PREFIX = "*PREFIX*"; const DEFAULT_CLIENT_GROUP_NAME = "Nom du groupe"; const DEFAULT_ADMIN_ID_NEXTCLOUD = 'admin'; - const DEFAULT_ADMIN_APP_ID_NEXTCLOUD = "Johann"; + const DEFAULT_ADMIN_APP_ID_NEXTCLOUD = "admin"; const ISLEAVEPROPERTYONVCALENDAR = "ISLEAVE"; From 086729bb0b3266096ea23b6d4ac04d7a76d0ddd4 Mon Sep 17 00:00:00 2001 From: FaniryArilanto Date: Wed, 12 Feb 2025 17:40:29 +0300 Subject: [PATCH 2/3] add CiCd on DRL release hytha --- Jenkinsfile | 8 ++++++++ 1 file changed, 8 insertions(+) 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" ''' + } + } } } From 985aa60f229405bc6075903f172cb3a842eff581 Mon Sep 17 00:00:00 2001 From: Tiavina Date: Wed, 19 Feb 2025 20:52:41 +0300 Subject: [PATCH 3/3] fec facture num --- gestion/lib/Controller/PageController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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,