Merge pull request #2015 from opensource-workshop/2.18.3

Merge v1.18.3 into 2

Author: akagane99

app/Plugins/User/Reservations/ReservationsPlugin.php

@@ -546,6 +546,9 @@ private function getColumnValue($input, $column = null, $inputs_column = null)
      */
     public function week($request, $page_id, $frame_id, $target_ymd)
     {
+        if (is_null($target_ymd)) {
+            $target_ymd = date('Ymd');
+        }
         $year = substr($target_ymd, 0, 4);
         $month = substr($target_ymd, 4, 2);
         $day = substr($target_ymd, 6, 2);
@@ -564,11 +567,13 @@ public function week($request, $page_id, $frame_id, $target_ymd)
      */
     public function month($request, $page_id, $frame_id, $target_ym)
     {
+        if (is_null($target_ym)) {
+            $target_ym = date('Ymd');
+        }
         $year = substr($target_ym, 0, 4);
         $month = substr($target_ym, 4, 2);
         $day = substr($target_ym, 6, 2);
         $day = empty($day) ? '01' : $day;
-        // if (!checkdate($month, '01', $year)) {
         if (!checkdate($month, $day, $year)) {
             return $this->viewError("404_inframe", null, '日時パラメータ不正(' . $year . '/' . $month . '/' . $day . ')');
         }

composer-dev.json

@@ -25,6 +25,7 @@
         "laravel/ui": "^3.0",
         "laravelcollective/html": "^6.0",
         "mews/captcha": "3.3.0",
+        "phpoffice/phpspreadsheet": "^1.12",
         "rlanvin/php-rrule": "^2.3",
         "setasign/fpdi": "^2.3",
         "symfony/yaml": "^5.4",