From f29a6e2c235ef7617b6517c254e8d340f9698f63 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 30 Oct 2022 09:52:20 +1100 Subject: [PATCH 1/2] Remove RFC requirements for email on setup --- app/Exceptions/Handler.php | 7 +++++-- app/Http/Requests/Setup/StoreSetupRequest.php | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index f13d26ee64a1..276ed694ff2f 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -205,11 +205,14 @@ class Handler extends ExceptionHandler return response()->json(['message' => $exception->getMessage()], 400); } elseif ($exception instanceof StripeConnectFailure) { return response()->json(['message' => $exception->getMessage()], 400); - } elseif ($exception instanceof QueryException) { - return response()->json(['message' => 'We had a problem executing this query. Please retry.'], 500); } + // elseif ($exception instanceof QueryException) { + // return response()->json(['message' => 'We had a problem executing this query. Please retry.'], 500); + // } + + return parent::render($request, $exception); } diff --git a/app/Http/Requests/Setup/StoreSetupRequest.php b/app/Http/Requests/Setup/StoreSetupRequest.php index 5432ea689e69..7329a49b0456 100644 --- a/app/Http/Requests/Setup/StoreSetupRequest.php +++ b/app/Http/Requests/Setup/StoreSetupRequest.php @@ -43,7 +43,7 @@ class StoreSetupRequest extends Request 'terms_of_service' => 'required', 'first_name' => 'required', 'last_name' => 'required', - 'email' => 'required|email:rfc,dns', + 'email' => 'required|email', 'password' => 'required', ]; From fd6cc95c3cdf72d342e89a4ccf54b130b3fd2d98 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 30 Oct 2022 09:52:42 +1100 Subject: [PATCH 2/2] v5.5.36 --- VERSION.txt | 2 +- config/ninja.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 03a49a0ddba2..aca435662ba1 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.5.35 \ No newline at end of file +5.5.36 \ No newline at end of file diff --git a/config/ninja.php b/config/ninja.php index 637ca998a915..dcabadb4d340 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -14,8 +14,8 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'), - 'app_version' => '5.5.35', - 'app_tag' => '5.5.35', + 'app_version' => '5.5.36', + 'app_tag' => '5.5.36', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', ''),