Skip to content

Commit 9dafd7e

Browse files
committed
Text and icons optimizations
1 parent 30dae83 commit 9dafd7e

File tree

145 files changed

+1582
-1562
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+1582
-1562
lines changed

app/Http/Controllers/Public/HomeController.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,15 @@ private function filtersHaveChanged(array $currentFilters, array $previousFilter
9090
private function getFilteredEquipments(Request $request, $locationPreferences, $page = null, $perPage = 10)
9191
{
9292
$query = Equipment::query()
93+
->where('is_available', true)
94+
->where('is_rentable', true)
9395
->select([
9496
'id',
9597
'name',
9698
'description',
9799
'rental_price',
98100
'is_available',
101+
'is_rentable',
99102
'category_id',
100103
'organization_id',
101104
'depot_id',
@@ -106,8 +109,7 @@ private function getFilteredEquipments(Request $request, $locationPreferences, $
106109
'depot:id,city',
107110
'images',
108111
])
109-
->orderByDesc('updated_at')
110-
->where('is_available', true);
112+
->orderByDesc('updated_at');
111113

112114
// Apply filters
113115
if ($request->filled('search')) {

app/Http/Requests/Equipment/StoreRequest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function messages(): array
6666
'depot_id.exists' => 'Le lieu de stockage sélectionné n\'existe pas.',
6767

6868
// Step 3
69-
'images.max' => 'Vous ne pouvez pas ajouter plus de 10 images.',
69+
'images.max' => 'Vous ne pouvez pas ajouter plus de 3 images.',
7070
'images.*.image' => 'Le fichier doit être une image.',
7171
'images.*.mimes' => 'L\'image doit être au format JPG, JPEG ou PNG.',
7272
'images.*.max' => 'L\'image ne peut pas dépasser 5MB.',

app/Http/Requests/Equipment/UpdateRequest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public function messages(): array
7575
'depot_id.exists' => 'Le lieu de stockage sélectionné n\'existe pas.',
7676

7777
// Step 3
78-
'images.max' => 'Vous ne pouvez pas ajouter plus de 10 images.',
78+
'images.max' => 'Vous ne pouvez pas ajouter plus de 3 images.',
7979
'images.*.image' => 'Le fichier doit être une image.',
8080
'images.*.mimes' => 'L\'image doit être au format JPG, JPEG ou PNG.',
8181
'images.*.max' => 'L\'image ne peut pas dépasser 5MB.',

composer.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/assets/AccordionTrigger.vue_vue_type_script_setup_true_lang-CG-7nw53.js renamed to public/build/assets/AccordionTrigger.vue_vue_type_script_setup_true_lang-RhlLNk1d.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/assets/AddressInput-BBjz30Na.js renamed to public/build/assets/AddressInput-C7vH7Jyp.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/assets/AdminLayout-BVXV9v8t.js renamed to public/build/assets/AdminLayout-Bo1qrMlO.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/assets/Appearance-CW5Gm89K.js renamed to public/build/assets/Appearance-wZ7Gfc_P.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/assets/AuthLayout.vue_vue_type_script_setup_true_lang-CoIlcnrE.js renamed to public/build/assets/AuthLayout.vue_vue_type_script_setup_true_lang-CrPh6xlt.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)