From caac6e264d7edc0fff302d55c6b05700f0593494 Mon Sep 17 00:00:00 2001 From: sky121113 Date: Wed, 18 Mar 2026 14:54:15 +0800 Subject: [PATCH] =?UTF-8?q?[FIX]=20=E4=BF=AE=E6=AD=A3=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E6=A9=9F=E5=8F=B0=E7=B7=A8=E8=BC=AF=E9=A0=81?= =?UTF-8?q?=E9=9D=A2=EF=BC=9A=E7=A7=BB=E9=99=A4=E6=96=9C=E9=AB=94=E4=B8=A6?= =?UTF-8?q?=E8=A3=9C=E4=B8=8A=E4=BD=8D=E7=BD=AE=E6=AC=84=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MachineSettingController.php | 2 + .../basic-settings/machines/edit.blade.php | 18 ++++--- .../basic-settings/machines/index.blade.php | 7 +++ .../views/admin/machines/create.blade.php | 42 ++++++++++------ resources/views/admin/machines/edit.blade.php | 50 +++++++++++++------ 5 files changed, 82 insertions(+), 37 deletions(-) diff --git a/app/Http/Controllers/Admin/BasicSettings/MachineSettingController.php b/app/Http/Controllers/Admin/BasicSettings/MachineSettingController.php index 02d9dd8..53c9540 100644 --- a/app/Http/Controllers/Admin/BasicSettings/MachineSettingController.php +++ b/app/Http/Controllers/Admin/BasicSettings/MachineSettingController.php @@ -68,6 +68,7 @@ class MachineSettingController extends AdminController 'company_id' => 'required|exists:companies,id', 'machine_model_id' => 'required|exists:machine_models,id', 'payment_config_id' => 'nullable|exists:payment_configs,id', + 'location' => 'nullable|string|max:255', 'images.*' => 'image|mimes:jpeg,png,jpg,gif|max:2048', ]); @@ -134,6 +135,7 @@ class MachineSettingController extends AdminController 'member_system_enabled' => 'boolean', 'machine_model_id' => 'required|exists:machine_models,id', 'payment_config_id' => 'nullable|exists:payment_configs,id', + 'location' => 'nullable|string|max:255', ]); Log::info('Machine Update Validated Data', ['data' => $validated]); diff --git a/resources/views/admin/basic-settings/machines/edit.blade.php b/resources/views/admin/basic-settings/machines/edit.blade.php index ced0f3a..78879b0 100644 --- a/resources/views/admin/basic-settings/machines/edit.blade.php +++ b/resources/views/admin/basic-settings/machines/edit.blade.php @@ -49,7 +49,7 @@
-

{{ __('Basic Information') }}

+

{{ __('Basic Information') }}

@@ -61,6 +61,10 @@
+
+ + +
-

* {{ __('Uploading new images will replace all existing images.') }}

+

* {{ __('Uploading new images will replace all existing images.') }}

diff --git a/resources/views/admin/basic-settings/machines/index.blade.php b/resources/views/admin/basic-settings/machines/index.blade.php index 58f97ba..40e7b17 100644 --- a/resources/views/admin/basic-settings/machines/index.blade.php +++ b/resources/views/admin/basic-settings/machines/index.blade.php @@ -345,6 +345,13 @@ @endforeach +
+ + +