From f6fda6ea8c05ed2f7ab178034075f7a7a5caa1d0 Mon Sep 17 00:00:00 2001
From: Matteo Gheza <matteo.gheza07@gmail.com>
Date: Thu, 29 Apr 2021 23:39:31 +0200
Subject: [PATCH] Fixes

---
 .github/workflows/php.yml              | 4 ++--
 server/modal_availability_schedule.php | 3 +++
 server/resources/package-lock.json     | 6 +++---
 server/resources/package.json          | 6 +++---
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 2d86998..af1efaa 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -186,7 +186,7 @@ jobs:
       run: |
         ls
         sudo wget -O deployment.phar https://github.com/dg/ftp-deployment/releases/download/v3.4.0/deployment.phar
-        echo '<?php $remotes = [ "staging" => [ "remote" => "${{ secrets.DEPLOY_URL }}", "sentry_env" => "staging" ] ]; ?>' > deployment_remotes.php
+        echo '<?php $remotes = [ "staging" => [ "remote" => "${{ secrets.DEPLOY_URL }}", "sentry_env" => "staging", "skip_composer_upload" => true ] ]; ?>' > deployment_remotes.php
         cat deployment_remotes.php
         ls
         php deployment.phar deployment.php --section staging
@@ -232,7 +232,7 @@ jobs:
       run: |
         ls
         sudo wget -O deployment.phar https://github.com/dg/ftp-deployment/releases/download/v3.4.0/deployment.phar
-        echo '<?php $remotes = [ "production" => [ "remote" => "${{ secrets.DEPLOY_URL }}", "sentry_env" => "prod" ] ]; ?>' > deployment_remotes.php
+        echo '<?php $remotes = [ "production" => [ "remote" => "${{ secrets.DEPLOY_URL }}", "sentry_env" => "prod", "skip_composer_upload" => true ] ]; ?>' > deployment_remotes.php
         cat deployment_remotes.php
         ls
         php deployment.phar deployment.php --section production
diff --git a/server/modal_availability_schedule.php b/server/modal_availability_schedule.php
index d6bb195..650b27c 100644
--- a/server/modal_availability_schedule.php
+++ b/server/modal_availability_schedule.php
@@ -53,6 +53,9 @@ if(!empty($result)){
         $old_schedules[$schedule[0]][$hour] = true;
     }
     $old_holidays = json_decode($result[0]["holidays"]);
+    if(is_null($old_holidays)){
+        $old_holidays = [];
+    }
 } else {
     $old_schedules = [];
     $old_holidays = [];
diff --git a/server/resources/package-lock.json b/server/resources/package-lock.json
index 60474dc..d55ca2c 100644
--- a/server/resources/package-lock.json
+++ b/server/resources/package-lock.json
@@ -25,9 +25,9 @@
         "colors": "^1.4.0",
         "copy-webpack-plugin": "^8.1.1",
         "css-loader": "^5.2.4",
-        "datatables.net-bs4": "^1.10.24",
-        "datatables.net-buttons-bs4": "^1.7.0",
-        "datatables.net-plugins": "^1.10.24",
+        "datatables.net-bs4": "^1.10.23",
+        "datatables.net-buttons-bs4": "^1.6.5",
+        "datatables.net-plugins": "^1.10.23",
         "datatables.net-responsive-bs4": "^2.2.7",
         "expose-loader": "^2.0.0",
         "file-loader": "^6.2.0",
diff --git a/server/resources/package.json b/server/resources/package.json
index 8f9670c..3687811 100644
--- a/server/resources/package.json
+++ b/server/resources/package.json
@@ -27,9 +27,9 @@
     "colors": "^1.4.0",
     "copy-webpack-plugin": "^8.1.1",
     "css-loader": "^5.2.4",
-    "datatables.net-bs4": "^1.10.24",
-    "datatables.net-buttons-bs4": "^1.7.0",
-    "datatables.net-plugins": "^1.10.24",
+    "datatables.net-bs4": "^1.10.23",
+    "datatables.net-buttons-bs4": "^1.6.5",
+    "datatables.net-plugins": "^1.10.23",
     "datatables.net-responsive-bs4": "^2.2.7",
     "expose-loader": "^2.0.0",
     "file-loader": "^6.2.0",