Merge branch 'main' into migrate-bootstrap

RoboJackets · Dec 9, 2024 · e9b80ca · e9b80ca
2 parents 339010d + 41f7521
commit e9b80ca
Show file tree

Hide file tree

Showing 29 changed files with 1,034 additions and 943 deletions.
diff --git a/.nomad/apiary.nomad b/.nomad/apiary.nomad
@@ -288,6 +288,16 @@ EOF
         ]
       }
 
+      action "clear-response-cache" {
+        command = "/usr/bin/php"
+
+        args = [
+          "-f",
+          "/app/artisan",
+          "responsecache:clear",
+        ]
+      }
+
       shutdown_delay = var.web_shutdown_delay
     }
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-# syntax = docker/dockerfile:1.10
+# syntax = docker/dockerfile:1.12
 
 FROM python:3.13-bookworm AS docs-source
 
@@ -13,7 +13,7 @@ RUN set -euxo pipefail && \
     /root/.local/bin/poetry install --no-interaction && \
     /root/.local/bin/poetry run sphinx-build -M dirhtml "." "_build"
 
-FROM node:22.11.0 AS docs-minification
+FROM node:22.12.0 AS docs-minification
 
 COPY --link --from=docs-source /docs/_build/dirhtml/ /docs/
 
@@ -42,7 +42,7 @@ COPY --link package.json package-lock.json webpack.mix.js artisan /app/
 COPY --link resources/ /app/resources/
 COPY --link public/ /app/public/
 
-FROM node:22.11.0 AS nova-components
+FROM node:22.12.0 AS nova-components
 
 COPY --link /nova-components/ /nova-components/
 
@@ -60,7 +60,7 @@ RUN set -eux && \
     npm install --no-progress && \
     npm run production --no-progress
 
-FROM node:22.11.0 AS frontend
+FROM node:22.12.0 AS frontend
 
 COPY --link --from=frontend-source /app/ /app/
 

diff --git a/app/Util/DocuSign.php b/app/Util/DocuSign.php
@@ -960,18 +960,6 @@ private static function directBillAirfareFormDocument(TravelAssignment $assignme
                 ->setXPosition(377)
                 ->setYPosition(self::DBA_Y_ALIGN_NAME)
                 ->setValue($assignment->user->first_name),
-            (new Text())
-                ->setTabType('text')
-                ->setDocumentId(2)
-                ->setPageNumber(1)
-                ->setFont('CourierNew')
-                ->setFontColor('Black')
-                ->setFontSize('Size12')
-                ->setHeight(20)
-                ->setWidth(100)
-                ->setXPosition(492)
-                ->setYPosition(self::DBA_Y_ALIGN_NAME)
-                ->setValue($assignment->user->legal_middle_name),
             (new Text())
                 ->setTabType('text')
                 ->setDocumentId(2)
@@ -1049,6 +1037,21 @@ private static function directBillAirfareFormDocument(TravelAssignment $assignme
                 ->setValue($assignment->user->employee_id);
         }
 
+        if ($assignment->user->legal_middle_name !== null) {
+            $textTabs[] = (new Text())
+                ->setTabType('text')
+                ->setDocumentId(2)
+                ->setPageNumber(1)
+                ->setFont('CourierNew')
+                ->setFontColor('Black')
+                ->setFontSize('Size12')
+                ->setHeight(20)
+                ->setWidth(100)
+                ->setXPosition(492)
+                ->setYPosition(self::DBA_Y_ALIGN_NAME)
+                ->setValue($assignment->user->legal_middle_name);
+        }
+
         return (new Document())
             ->setDocumentId(2)
             ->setDisplay('inline')

diff --git a/composer.json b/composer.json
@@ -27,25 +27,25 @@
         "ext-zip": "*",
         "ans-group/laravel-health-check": "2.0.1",
         "apereo/phpcas": "1.6.1",
-        "ashallendesign/laravel-config-validator": "2.6.1",
+        "ashallendesign/laravel-config-validator": "2.7.0",
         "barryvdh/laravel-dompdf": "3.0.0",
         "calebporzio/sushi": "2.5.2",
         "chelout/laravel-relationship-events": "3.0.0",
         "docusign/esign-client": "6.19.0",
         "eluceo/ical": "2.14.0",
         "enlightn/enlightn": "2.10.0",
         "enlightn/security-checker": "2.0.0",
-        "fakerphp/faker": "1.23.1",
+        "fakerphp/faker": "1.24.1",
         "guzzlehttp/guzzle": "7.9.2",
         "htmlmin/htmlmin": "dev-master",
         "http-interop/http-factory-guzzle": "1.2.0",
         "kiritokatklian/nova-permission": "4.0.10",
-        "laravel/framework": "11.30.0",
-        "laravel/horizon": "5.29.2",
-        "laravel/nova": "4.35.4",
-        "laravel/passport": "12.3.0",
-        "laravel/scout": "10.11.5",
-        "laravel/slack-notification-channel": "3.4.0",
+        "laravel/framework": "11.34.2",
+        "laravel/horizon": "5.29.4",
+        "laravel/nova": "4.35.5",
+        "laravel/passport": "12.3.1",
+        "laravel/scout": "10.11.8",
+        "laravel/slack-notification-channel": "3.4.1",
         "laravel/socialite": "5.16.0",
         "laravel/tinker": "2.10.0",
         "madewithlove/laravel-nova-uuid-support": "1.6",
@@ -55,30 +55,30 @@
         "realrashid/sweet-alert": "7.2.0",
         "robojackets/client-id-and-secret-modal": "@dev",
         "robojackets/personal-access-token-modal": "@dev",
-        "sentry/sentry-laravel": "4.9.0",
+        "sentry/sentry-laravel": "4.10.1",
         "spatie/laravel-csp": "2.10.1",
         "spatie/laravel-failed-job-monitor": "4.3.2",
-        "spatie/laravel-permission": "6.9.0",
-        "spatie/laravel-responsecache": "7.6.0",
+        "spatie/laravel-permission": "6.10.1",
+        "spatie/laravel-responsecache": "7.6.1",
         "spatie/laravel-webhook-client": "3.4.2",
         "square/square": "38.2.0.20241017",
         "subfission/cas": "5.1.0",
-        "symfony/http-client": "7.1.6",
+        "symfony/http-client": "7.1.8",
         "symfony/postmark-mailer": "7.1.6",
-        "xammie/mailbook": "1.8.1"
+        "xammie/mailbook": "1.8.3"
     },
     "require-dev": {
         "barryvdh/laravel-ide-helper": "3.0.0",
         "beyondcode/laravel-dump-server": "2.0.0",
         "filp/whoops": "2.15.4",
-        "laravel/pint": "1.18.1",
+        "laravel/pint": "1.18.3",
         "mockery/mockery": "1.6.12",
         "mxl/laravel-job": "1.6.0",
         "nunomaduro/collision": "8.1.1",
-        "larastan/larastan": "2.9.9",
+        "larastan/larastan": "2.9.11",
         "phan/phan": "5.4.5",
         "phpstan/extension-installer": "1.4.3",
-        "phpstan/phpstan": "1.12.7",
+        "phpstan/phpstan": "1.12.10",
         "phpstan/phpstan-deprecation-rules": "1.2.1",
         "phpstan/phpstan-strict-rules": "1.6.1",
         "phpunit/phpunit": "10.5.20",
@@ -173,6 +173,9 @@
             "phpstan/extension-installer": true,
             "dealerdirect/phpcodesniffer-composer-installer": true,
             "php-http/discovery": true
+        },
+        "platform": {
+            "php": "8.3.6"
         }
     },
     "extra": {