From 8ff109e9da9fc18650ae87b15bf348a73b979500 Mon Sep 17 00:00:00 2001 From: Phan Nguyen Date: Sat, 8 Oct 2022 12:54:15 +0700 Subject: [PATCH 1/2] Correct comparison logic Comparison operator should be greater than or equal --- app/Http/Controllers/Api/LicenseSeatsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/LicenseSeatsController.php b/app/Http/Controllers/Api/LicenseSeatsController.php index 4d0fe0994956..759f11e95691 100644 --- a/app/Http/Controllers/Api/LicenseSeatsController.php +++ b/app/Http/Controllers/Api/LicenseSeatsController.php @@ -39,7 +39,7 @@ public function index(Request $request, $licenseId) } $total = $seats->count(); - $offset = (($seats) && (request('offset') > $total)) ? 0 : request('offset', 0); + $offset = (($seats) && (request('offset') >= $total)) ? 0 : request('offset', 0); $limit = request('limit', 50); $seats = $seats->skip($offset)->take($limit)->get(); From d3161fad020ecce2eab0fb7f48b166a07be14f11 Mon Sep 17 00:00:00 2001 From: Phan Nguyen Date: Tue, 11 Oct 2022 15:49:56 +0700 Subject: [PATCH 2/2] Remove required mark Because it actually not required by model. --- resources/views/licenses/edit.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/licenses/edit.blade.php b/resources/views/licenses/edit.blade.php index b8b0e13a695c..0936f8b2b7a4 100755 --- a/resources/views/licenses/edit.blade.php +++ b/resources/views/licenses/edit.blade.php @@ -34,7 +34,7 @@ @include ('partials.forms.edit.company-select', ['translated_name' => trans('general.company'), 'fieldname' => 'company_id']) -@include ('partials.forms.edit.manufacturer-select', ['translated_name' => trans('general.manufacturer'), 'fieldname' => 'manufacturer_id', 'required' => 'true']) +@include ('partials.forms.edit.manufacturer-select', ['translated_name' => trans('general.manufacturer'), 'fieldname' => 'manufacturer_id',])