Merge branch 'main' into sentry

RoboJackets · Oct 20, 2024 · 8c83f75 · 8c83f75
2 parents 8d8334d + be622ec
commit 8c83f75
Show file tree

Hide file tree

Showing 12 changed files with 1,027 additions and 1,056 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:1.10
 
-FROM python:3.12-bookworm AS docs-source
+FROM python:3.13-bookworm AS docs-source
 
 COPY --link docs/ /docs/
 
@@ -60,7 +60,7 @@ RUN set -eux && \
     npm install --no-progress && \
     npm run production --no-progress
 
-FROM node:20.17.0 AS frontend
+FROM node:20.18.0 AS frontend
 
 COPY --link --from=frontend-source /app/ /app/
 

diff --git a/app/Util/SquareCheckout.php b/app/Util/SquareCheckout.php
@@ -75,9 +75,12 @@ public static function redirectToSquare(
             } elseif (Str::startsWith('1', $user->phone) && Str::length($user->phone) === 11) {
                 // has united states country code but no +, just add it
                 $prePopulatedData->setBuyerPhoneNumber('+'.$user->phone);
-            } else {
+            } elseif (Str::length($user->phone) === 10) {
                 // assume united states number
                 $prePopulatedData->setBuyerPhoneNumber('+1'.$user->phone);
+            } else {
+                // assume international number with country code
+                $prePopulatedData->setBuyerPhoneNumber('+'.$user->phone);
             }
         }
 

diff --git a/composer.json b/composer.json
@@ -40,11 +40,11 @@
         "htmlmin/htmlmin": "dev-master",
         "http-interop/http-factory-guzzle": "1.2.0",
         "kiritokatklian/nova-permission": "4.0.10",
-        "laravel/framework": "11.25.0",
-        "laravel/horizon": "5.29.0",
-        "laravel/nova": "4.35.2",
+        "laravel/framework": "11.28.1",
+        "laravel/horizon": "5.29.1",
+        "laravel/nova": "4.35.3",
         "laravel/passport": "12.3.0",
-        "laravel/scout": "10.11.3",
+        "laravel/scout": "10.11.4",
         "laravel/slack-notification-channel": "3.3.2",
         "laravel/socialite": "5.16.0",
         "laravel/tinker": "2.10.0",
@@ -61,7 +61,7 @@
         "spatie/laravel-permission": "6.9.0",
         "spatie/laravel-responsecache": "7.6.0",
         "spatie/laravel-webhook-client": "3.4.2",
-        "square/square": "38.0.0.20240821",
+        "square/square": "38.1.0.20240919",
         "subfission/cas": "5.1.0",
         "symfony/http-client": "7.1.5",
         "symfony/postmark-mailer": "7.1.1",
@@ -78,9 +78,9 @@
         "larastan/larastan": "2.9.8",
         "phan/phan": "5.4.3",
         "phpstan/extension-installer": "1.4.3",
-        "phpstan/phpstan": "1.12.3",
-        "phpstan/phpstan-deprecation-rules": "1.2.0",
-        "phpstan/phpstan-strict-rules": "1.6.0",
+        "phpstan/phpstan": "1.12.5",
+        "phpstan/phpstan-deprecation-rules": "1.2.1",
+        "phpstan/phpstan-strict-rules": "1.6.1",
         "phpunit/phpunit": "10.5.20",
         "psalm/plugin-laravel": "2.11.0",
         "slevomat/coding-standard": "8.15.0",