Merge pull request #10894 from turbo124/v5-develop

v5.11.68

VERSION.txt

@@ -1 +1 @@
-5.11.67
+5.11.68

app/Http/Controllers/Reports/ActivityReportController.php

@@ -29,7 +29,6 @@ class ActivityReportController extends BaseController
         parent::__construct();
     }
 
-
     public function __invoke(GenericReportRequest $request)
     {
 

app/Http/Middleware/ValidJson.php

@@ -34,6 +34,7 @@ class ValidJson
 
         if (
             $request->isJson() &&
+            $request->getContent() !== '' &&
             is_null(json_decode($request->getContent())) &&
             json_last_error() !== JSON_ERROR_NONE
         ) {

app/Http/Requests/Account/CreateAccountRequest.php

@@ -54,6 +54,7 @@ class CreateAccountRequest extends Request
             'utm_campaign'      => 'sometimes|nullable|string',
             'utm_term'          => 'sometimes|nullable|string',
             'utm_content'       => 'sometimes|nullable|string',
+            // 'cf-turnstile' => 'required|string',
         ];
     }
 

app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php

@@ -94,7 +94,7 @@ class UpdateRecurringInvoiceRequest extends Request
         }
 
         if (!isset($input['next_send_date']) || $input['next_send_date'] == '') {
-            $input['next_send_date'] = now()->format('Y-m-d');
+            $input['next_send_date'] = $this->recurring_invoice->next_send_date ?? now()->format('Y-m-d');
         }
 
         if (array_key_exists('next_send_date', $input) && is_string($input['next_send_date'])) {

app/Http/ValidationRules/Account/BlackListRule.php

@@ -21,6 +21,11 @@ class BlackListRule implements ValidationRule
 {
     /** Bad domains +/- disposable email domains */
     private array $blacklist = [
+        'easymailer.live',
+        'mynes.com',
+        'techeback.online',
+        'deliverydaily.org',
+        'ptct.net',
         'cybtric.com',
         'intady.com',
         'nike4s.com',

config/ninja.php

@@ -17,8 +17,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => env('APP_VERSION', '5.11.67'),
-    'app_tag' => env('APP_TAG', '5.11.67'),
+    'app_version' => env('APP_VERSION', '5.11.68'),
+    'app_tag' => env('APP_TAG', '5.11.68'),
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),

routes/api.php

@@ -130,7 +130,7 @@ use App\Http\Controllers\Reports\RecurringInvoiceReportController;
 use App\Http\Controllers\Reports\PurchaseOrderItemReportController;
 
 Route::group(['middleware' => ['throttle:api', 'api_secret_check']], function () {
-    Route::post('api/v1/signup', [AccountController::class, 'store'])->name('signup.submit');
+    Route::post('api/v1/signup', [AccountController::class, 'store'])->name('signup.submit')->middleware('throttle:1,10');
     Route::post('api/v1/oauth_login', [LoginController::class, 'oauthApiLogin']);
 });