Merge pull request #171 from WDI-Ideas/sayli

Sayli
This commit is contained in:
Sayli Raut
2024-06-18 19:15:45 +05:30
committed by GitHub
6 changed files with 48 additions and 28 deletions

View File

@@ -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');

View File

@@ -23,6 +23,7 @@ class ManageState extends Model
'deleted_at',
'created_at',
'updated_at',
'state_xid',
];
}

View File

@@ -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();

View File

@@ -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",

View File

@@ -47,12 +47,6 @@
<input type="text" class="form-control" name="name" required>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label for="company-name" class="label">Description</label>
<textarea type="text" class="form-control" name="description" required></textarea>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label for="company-name" class="label">Restaurant ID</label>
@@ -79,9 +73,21 @@
<div class="col-md-6">
<div class="form-group ">
<label for="location" class="label">Exclusion</label>
<textarea type="text" class="form-control" name="exclusion" ></textarea>
<textarea type="text" class="form-control" name="exclusion"></textarea>
</div>
</div>
<div class="col-md-6">
<label for="location" class="label">Select state</label>
<select class="form-select" aria-label="Default select example" id="single"
name="state_xid">
<option value="">Select State</option>
@foreach ($state as $states)
<option value="{{ $states['id'] }}">{{ $states['name'] }}
</option>
@endforeach
</select>
</div>
<div class="col-md-6">
<div class="form-group ">
<label for="location" class="label">Latitude</label>
@@ -97,7 +103,8 @@
<div class="col-md-6">
<div class="form-group ">
<label for="phone_number" class="label">Phone number</label>
<input type="text" class="form-control" name="phone_number" maxlength="15" required>
<input type="text" class="form-control" name="phone_number" maxlength="15"
required>
</div>
</div>
<div class="col-md-6">

View File

@@ -50,13 +50,6 @@
maxlength="40" value="{{ $restaurantItem->name }}">
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label for="company-name" class="label">Description</label>
<textarea type="text" class="form-control" name="description">{!! $restaurantItem->description !!}</textarea>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label for="company-name" class="label">Restaurant ID</label>
@@ -80,14 +73,14 @@
<div class="form-group ">
<label for="company-name" class="label">Restaurant Address</label>
<input type="text" class="form-control" id="location_name"
name="location_name" value="{{ $restaurantItem->address }}" >
name="location_name" value="{{ $restaurantItem->address }}">
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label for="company-name" class="label">Phone Number</label>
<input type="text" class="form-control" id="phone_number"
name="phone_number" value="{{ $restaurantItem->phone_number }}" maxlength="15">
<input type="text" class="form-control" id="phone_number" name="phone_number"
value="{{ $restaurantItem->phone_number }}" maxlength="15">
</div>
</div>
<div class="col-md-6">
@@ -96,6 +89,19 @@
<textarea type="text" class="form-control" id="exclusion" name="exclusion">{!! $restaurantItem->exclusion !!}</textarea>
</div>
</div>
<div class="col-md-6">
<label for="location" class="label">Select state</label>
<select class="form-select" aria-label="Default select example" id="single"
name="state_xid">
<option value="">Select State</option>
@foreach ($state as $states)
<option value="{{ $states['id'] }}"
@if ($states['id'] == $restaurantItem->state_xid) selected @endif>
{{ $states['name'] }}
</option>
@endforeach
</select>
</div>
<div class="col-md-6">
<div class="form-group ">
<label for="company-name" class="label">Latitude</label>
@@ -225,7 +231,7 @@
name: {
required: true
},
description: {
state_xid: {
required: true,
},
rest_id: {
@@ -271,8 +277,8 @@
name: {
required: "Enter restaurant Name",
},
description: {
required: "Enter Description",
state_xid: {
required: "Please select state",
},
rest_id: {
required: "Enter restaurant Id",