Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 08:21:34 +02:00
Code Issues Releases Activity

v5.8.38

Browse Source
This commit is contained in:
David Bomba 2024-03-25 15:19:46 +11:00
parent 4aaf3bab52
commit 83b65e046e
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.8.37 5.8.38

8
app/Http/Requests/Report/ProductSalesReportRequest.php
View File

@ -11,8 +11,10 @@
namespace App\Http\Requests\Report; namespace App\Http\Requests\Report;
use App\Utils\Ninja;
use App\Http\Requests\Request; use App\Http\Requests\Request;
use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesHash;
use Illuminate\Auth\Access\AuthorizationException;
class ProductSalesReportRequest extends Request class ProductSalesReportRequest extends Request
{ {
@ -32,13 +34,17 @@ class ProductSalesReportRequest extends Request
public function rules() public function rules()
{ {
/** @var \App\Models\User $user */
$user = auth()->user();
return [ return [
'date_range' => 'bail|required|string', 'date_range' => 'bail|required|string',
'end_date' => 'bail|required_if:date_range,custom|nullable|date', 'end_date' => 'bail|required_if:date_range,custom|nullable|date',
'start_date' => 'bail|required_if:date_range,custom|nullable|date', 'start_date' => 'bail|required_if:date_range,custom|nullable|date',
'report_keys' => 'bail|present|array', 'report_keys' => 'bail|present|array',
'send_email' => 'bail|required|bool', 'send_email' => 'bail|required|bool',
'client_id' => 'bail|nullable|sometimes|exists:clients,id,company_id,'.auth()->user()->company()->id.',is_deleted,0', 'client_id' => 'bail|nullable|sometimes|exists:clients,id,company_id,'.$user->company()->id.',is_deleted,0',
]; ];
} }

1
app/Http/Requests/Report/ProfitLossRequest.php
View File

@ -11,6 +11,7 @@
namespace App\Http\Requests\Report; namespace App\Http\Requests\Report;
use App\Utils\Ninja;
use App\Http\Requests\Request; use App\Http\Requests\Request;
use Illuminate\Auth\Access\AuthorizationException; use Illuminate\Auth\Access\AuthorizationException;

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.8.37'), 'app_version' => env('APP_VERSION', '5.8.38'),
'app_tag' => env('APP_TAG', '5.8.37'), 'app_tag' => env('APP_TAG', '5.8.38'),
'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),