Sultan
/
invoiceninja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10894 from turbo124/v5-develop 

v5.11.68
This commit is contained in:
David Bomba 2025-04-16 00:17:20 +10:00 committed by GitHub
parent 7ee7af35d1 cecb7c07a2
commit 42ceb6e405
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.11.67 5.11.68

1
app/Http/Controllers/Reports/ActivityReportController.php
View File

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

1
app/Http/Middleware/ValidJson.php
View File

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

1
app/Http/Requests/Account/CreateAccountRequest.php
View File

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

2
app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php
View File

@ -94,7 +94,7 @@ class UpdateRecurringInvoiceRequest extends Request
} }
if (!isset($input['next_send_date']) || $input['next_send_date'] == '') { 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'])) { if (array_key_exists('next_send_date', $input) && is_string($input['next_send_date'])) {

5
app/Http/ValidationRules/Account/BlackListRule.php
View File

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

4
config/ninja.php
View File

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

2
routes/api.php
View File

@ -130,7 +130,7 @@ use App\Http\Controllers\Reports\RecurringInvoiceReportController;
use App\Http\Controllers\Reports\PurchaseOrderItemReportController; use App\Http\Controllers\Reports\PurchaseOrderItemReportController;
Route::group(['middleware' => ['throttle:api', 'api_secret_check']], function () { 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']); Route::post('api/v1/oauth_login', [LoginController::class, 'oauthApiLogin']);
}); });