diff --git a/app/Http/Controllers/Admin/ManageRestrauntController.php b/app/Http/Controllers/Admin/ManageRestrauntController.php index 2e56346..ef3338a 100644 --- a/app/Http/Controllers/Admin/ManageRestrauntController.php +++ b/app/Http/Controllers/Admin/ManageRestrauntController.php @@ -11,6 +11,7 @@ use Illuminate\Http\Request; use Exception; use App\Helpers\onesignalhelper; use App\Models\IamPrincipal; +use App\Models\ManageState; use Illuminate\Support\Facades\Log; use Maatwebsite\Excel\Facades\Excel; use Illuminate\Support\Facades\DB; @@ -44,7 +45,8 @@ class ManageRestrauntController extends Controller */ public function add() { - return view('Admin.pages.manage_restaurants.add_restaurant'); + $state = ManageState::where('is_active', 1)->get()->toArray(); + return view('Admin.pages.manage_restaurants.add_restaurant', compact('state')); } @@ -69,7 +71,6 @@ class ManageRestrauntController extends Controller // Creating the restaurant $restaurant = new ManageRestaurant(); $restaurant->name = $request->input('name'); - $restaurant->description = $request->input('description'); $restaurant->image = $imagePath; $restaurant->restaurant_id = $request->input('rest_id'); $restaurant->address = $request->input('address'); @@ -78,6 +79,7 @@ class ManageRestrauntController extends Controller $restaurant->longtitude = $request->input('longitude'); $restaurant->exclusion = $request->input('exclusion'); $restaurant->phone_number = $request->input('phone_number'); + $restaurant->state_xid = $request->input('state_xid'); $restaurant->try_on_1 = $request->input('try_on_1'); $restaurant->try_on_2 = $request->input('try_on_2'); $restaurant->try_on_3 = $request->input('try_on_3'); @@ -136,13 +138,15 @@ class ManageRestrauntController extends Controller try { $operating_hours = OperatingHour::where('manage_restaurant_xid', $id)->get()->keyBy('day_of_week'); $restaurantItem = ManageRestaurant::where('id', $id)->first(); + $state = ManageState::where('is_active', 1)->get()->toArray(); $restaurantItem['image'] = ListingImageUrl('restaurant_images', $restaurantItem['image']); return view( 'Admin.pages.manage_restaurants.edit_restaurant', compact( 'restaurantItem', - 'operating_hours' + 'operating_hours', + 'state' ) ); } catch (Exception $e) { @@ -177,6 +181,7 @@ class ManageRestrauntController extends Controller $restaurant->address = $request->input('location_name'); $restaurant->exclusion = $request->input('exclusion'); $restaurant->phone_number = $request->input('phone_number'); + $restaurant->state_xid = $request->input('state_xid'); $restaurant->latitude = $request->input('latitude'); $restaurant->longtitude = $request->input('longitude'); $restaurant->bio = $request->input('bio'); diff --git a/app/Models/ManageState.php b/app/Models/ManageState.php index 7d6968a..480a90c 100644 --- a/app/Models/ManageState.php +++ b/app/Models/ManageState.php @@ -23,6 +23,7 @@ class ManageState extends Model 'deleted_at', 'created_at', 'updated_at', - + 'state_xid', + ]; } diff --git a/database/migrations/2024_05_28_095429_create_manage_restaurants_table.php b/database/migrations/2024_05_28_095429_create_manage_restaurants_table.php index 5fb9915..7a6a0b8 100644 --- a/database/migrations/2024_05_28_095429_create_manage_restaurants_table.php +++ b/database/migrations/2024_05_28_095429_create_manage_restaurants_table.php @@ -18,6 +18,7 @@ return new class extends Migration $table->string('name',255)->nullable(); $table->longText('description')->nullable(); $table->string('phone_number', 15)->nullable(); + $table->bigInteger('state_xid')->nullable(); $table->string('restaurant_id')->nullable(); $table->string('address',255)->nullable(); $table->string('image')->nullable(); diff --git a/public/assets/js/admin/manage_restaurant/add_restaurant.js b/public/assets/js/admin/manage_restaurant/add_restaurant.js index dbe02e4..ab5c7bd 100644 --- a/public/assets/js/admin/manage_restaurant/add_restaurant.js +++ b/public/assets/js/admin/manage_restaurant/add_restaurant.js @@ -6,7 +6,7 @@ $(document).on("click", "#update_restaurant_btn", function (e) { name: { required: true }, - description: { + state_xid: { required: true, }, rest_id: { @@ -55,8 +55,8 @@ $(document).on("click", "#update_restaurant_btn", function (e) { name: { required: "Enter restaurant Name", }, - description: { - required: "Enter Description", + state_xid: { + required: "Please Select state", }, rest_id: { required: "Enter restaurant Id", diff --git a/resources/views/Admin/pages/manage_restaurants/add_restaurant.blade.php b/resources/views/Admin/pages/manage_restaurants/add_restaurant.blade.php index f64cd2f..96999cd 100644 --- a/resources/views/Admin/pages/manage_restaurants/add_restaurant.blade.php +++ b/resources/views/Admin/pages/manage_restaurants/add_restaurant.blade.php @@ -47,12 +47,6 @@ -