diff --git a/app/Http/Controllers/Admin/ManageRestrauntController.php b/app/Http/Controllers/Admin/ManageRestrauntController.php index a2146dc..938280f 100644 --- a/app/Http/Controllers/Admin/ManageRestrauntController.php +++ b/app/Http/Controllers/Admin/ManageRestrauntController.php @@ -131,16 +131,16 @@ class ManageRestrauntController extends Controller { try { DB::beginTransaction(); - + $restaurant = ManageRestaurant::where('id', $request->id)->first(); - + if ($request->hasFile('image')) { $image = $request->file('image'); $imagePath = saveSingleImageWithoutCrop($image, 'restaurant_images'); } else { $imagePath = $restaurant->image; } - + $restaurant->name = $request->input('name'); $restaurant->description = $request->input('description'); $restaurant->image = $imagePath; @@ -155,20 +155,31 @@ class ManageRestrauntController extends Controller $restaurant->try_on_3 = $request->input('try_on_3'); $restaurant->try_on_4 = $request->input('try_on_4'); $restaurant->save(); - - OperatingHour::where('manage_restaurant_xid', $restaurant->id)->delete(); - + foreach ($request->input('operating_hours') as $day => $hours) { - OperatingHour::create([ - 'manage_restaurant_xid' => $restaurant->id, - 'day_of_week' => $day, - 'start_time' => $hours['start_time'], - 'end_time' => $hours['end_time'] - ]); + $operatingHour = OperatingHour::where('manage_restaurant_xid', $restaurant->id) + ->where('day_of_week', $day) + ->first(); + + if ($operatingHour) { + // Update existing record + $operatingHour->update([ + 'start_time' => $hours['start_time'], + 'end_time' => $hours['end_time'] + ]); + } else { + // Create new record + OperatingHour::create([ + 'manage_restaurant_xid' => $restaurant->id, + 'day_of_week' => $day, + 'start_time' => $hours['start_time'], + 'end_time' => $hours['end_time'] + ]); + } } - + DB::commit(); - + return jsonResponseWithSuccessMessage(__('success.update_data')); } catch (Exception $e) { DB::rollBack(); @@ -176,6 +187,7 @@ class ManageRestrauntController extends Controller return jsonResponseWithErrorMessage(__('auth.something_went_wrong'), 500); } } + /* diff --git a/public/assets/js/admin/manage_restaurant/add_restaurant.js b/public/assets/js/admin/manage_restaurant/add_restaurant.js index 2e2706b..57036c7 100644 --- a/public/assets/js/admin/manage_restaurant/add_restaurant.js +++ b/public/assets/js/admin/manage_restaurant/add_restaurant.js @@ -23,9 +23,17 @@ $(document).on("click", "#update_restaurant_btn", function (e) { }, latitude: { required: true, + number: true, + normalizer: function(value) { + return $.trim(value); + } }, longitude: { required: true, + number: true, + normalizer: function(value) { + return $.trim(value); + } }, bio: { required: true, @@ -64,9 +72,11 @@ $(document).on("click", "#update_restaurant_btn", function (e) { }, latitude: { required: "Please enter latitude", + number: "Latitude must be a number without spaces", }, - longitude: { // Fixed the typo 'longtitude' to 'longitude' + longitude: { required: "Please enter longitude", + number: "Longitude must be a number without spaces", }, bio: { required: "Enter Bio", diff --git a/resources/views/Admin/pages/manage_restaurants/edit_restaurant.blade.php b/resources/views/Admin/pages/manage_restaurants/edit_restaurant.blade.php index 515d9bf..c471fea 100644 --- a/resources/views/Admin/pages/manage_restaurants/edit_restaurant.blade.php +++ b/resources/views/Admin/pages/manage_restaurants/edit_restaurant.blade.php @@ -233,9 +233,17 @@ }, latitude: { required: true, + number: true, + normalizer: function(value) { + return $.trim(value); + } }, longitude: { required: true, + number: true, + normalizer: function(value) { + return $.trim(value); + } }, bio: { required: true, @@ -271,9 +279,11 @@ }, latitude: { required: "Please enter latitude", + number: "Latitude must be a number without spaces", }, longitude: { required: "Please enter longitude", + number: "Longitude must be a number without spaces", }, bio: { required: "Enter Bio",