git add .
git commit "fix: city selection, comment user display, and back button bug"
This commit is contained in:
@@ -20,7 +20,7 @@
|
||||
</div>
|
||||
|
||||
<h4>
|
||||
</h4>
|
||||
</h4>
|
||||
|
||||
<span>
|
||||
{{Auth::user()->email}}
|
||||
|
||||
@@ -34,7 +34,13 @@
|
||||
<div class="comment-header">
|
||||
<div>
|
||||
<h4>
|
||||
{{ $comment->tour->title ?? 'مورد حذف شده' }}
|
||||
@if($comment->tour_id)
|
||||
{{ $comment->tour->title ?? 'مورد حذف شده' }}
|
||||
@elseif($comment->flight_id)
|
||||
{{ $comment->flight->airline ?? 'مورد حذف شده' }}
|
||||
@else
|
||||
مورد حذف شده
|
||||
@endif
|
||||
</h4>
|
||||
<span>
|
||||
{{ $comment->created_at->format('Y/m/d') }}
|
||||
|
||||
@@ -35,7 +35,11 @@
|
||||
@if($favorite->favoritable_type == 'App\Models\Tour')
|
||||
|
||||
<h3>
|
||||
{{ $favorite->favoritable?->title ?? 'مورد حذف شده' }} </h3>
|
||||
{{ $favorite->favoritable?->title ?? 'مورد حذف شده' }}
|
||||
</h3>
|
||||
<h3>
|
||||
{{ $favorite->favoritable?->summary ?? 'مورد حذف شده' }}
|
||||
</h3>
|
||||
|
||||
<p>
|
||||
تور
|
||||
@@ -44,7 +48,10 @@
|
||||
@elseif($favorite->favoritable_type == 'App\Models\Flight')
|
||||
|
||||
<h3>
|
||||
{{ $favorite->favoritable->name }}
|
||||
{{ $favorite->favoritable->airline }}
|
||||
</h3>
|
||||
<h3>
|
||||
{{ $favorite->favoritable->flight_number }}
|
||||
</h3>
|
||||
|
||||
<p>
|
||||
|
||||
@@ -632,9 +632,8 @@
|
||||
.append('<option value="">در حال دریافت شهرها...</option>');
|
||||
|
||||
$.ajax({
|
||||
url: "{{ route('users.cities.province', ':province') }}"
|
||||
url: "{{ route('cities.province', ':province') }}"
|
||||
.replace(':province', provinceId),
|
||||
|
||||
type: 'GET',
|
||||
|
||||
success: function (cities) {
|
||||
@@ -660,13 +659,9 @@
|
||||
},
|
||||
|
||||
error: function () {
|
||||
|
||||
citySelect.empty();
|
||||
|
||||
citySelect.append(
|
||||
'<option value="">خطا در دریافت شهرها</option>'
|
||||
);
|
||||
|
||||
citySelect.append('<option value="">خطا در دریافت شهرها</option>');
|
||||
citySelect.prop('disabled', false);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
@@ -570,5 +570,42 @@
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<script>
|
||||
document.addEventListener('DOMContentLoaded', function () {
|
||||
const provinceSelect = document.getElementById('province_id');
|
||||
const citySelect = document.getElementById('city_id');
|
||||
|
||||
provinceSelect.addEventListener('change', function () {
|
||||
const provinceId = this.value;
|
||||
|
||||
citySelect.innerHTML = '<option value="">در حال بارگذاری...</option>';
|
||||
citySelect.disabled = true;
|
||||
|
||||
if (!provinceId) {
|
||||
citySelect.innerHTML = '<option value="">ابتدا استان را انتخاب کنید</option>';
|
||||
return;
|
||||
}
|
||||
|
||||
fetch(`{{ url('/cities') }}/${provinceId}`)
|
||||
.then(response => response.json())
|
||||
.then(cities => {
|
||||
citySelect.innerHTML = '<option value="">انتخاب شهرستان</option>';
|
||||
|
||||
cities.forEach(city => {
|
||||
const option = document.createElement('option');
|
||||
option.value = city.id;
|
||||
option.textContent = city.name;
|
||||
citySelect.appendChild(option);
|
||||
});
|
||||
|
||||
citySelect.disabled = false;
|
||||
})
|
||||
.catch(() => {
|
||||
citySelect.innerHTML = '<option value="">خطا در دریافت شهرها</option>';
|
||||
citySelect.disabled = false;
|
||||
});
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
@endsection
|
||||
|
||||
@@ -166,7 +166,7 @@
|
||||
<div class="d-flex justify-content-between">
|
||||
|
||||
<strong>
|
||||
{{ $comment->user->name }}
|
||||
{{ $comment->user ? $comment->user->first_name . ' ' . $comment->user->last_name : 'کاربر مهمان' }}
|
||||
</strong>
|
||||
|
||||
<small>
|
||||
|
||||
@@ -15,31 +15,35 @@
|
||||
<link rel="stylesheet" href="{{ asset('assets/css/footer.css') }}">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
@includeUnless(isset($withoutHeader),'layouts.header')
|
||||
@includeUnless(isset($withoutHero),'layouts.hero')
|
||||
<body>
|
||||
@includeUnless(isset($withoutHeader),'layouts.header')
|
||||
@includeUnless(isset($withoutHero),'layouts.hero')
|
||||
@yield('content')
|
||||
@includeUnless(isset($withoutFooter),'layouts.footer')
|
||||
<script src="{{asset('assets/js/moment.js')}}"></script>
|
||||
<script src="{{asset('assets/js/bootstrap.js')}}"></script>
|
||||
<script src="{{asset('assets/js/owl-carousel.js')}}"></script>
|
||||
<script src="{{asset('assets/js/blur-area.js')}}"></script>
|
||||
<script src="{{asset('assets/js/icheck.js')}}"></script>
|
||||
<script src="{{asset('assets/js/gmap.js')}}"></script>
|
||||
<script src="{{asset('assets/js/magnific-popup.js')}}"></script>
|
||||
<script src="{{asset('assets/js/ion-range-slider.js')}}"></script>
|
||||
<script src="{{asset('assets/js/sticky-kit.js')}}"></script>
|
||||
<script src="{{asset('assets/js/smooth-scroll.js')}}"></script>
|
||||
<script src="{{asset('assets/js/fotorama.js')}}"></script>
|
||||
<script src="{{asset('assets/js/bs-datepicker.js')}}"></script>
|
||||
<script src="{{asset('assets/js/typeahead.js')}}"></script>
|
||||
<script src="{{asset('assets/js/quantity-selector.js')}}"></script>
|
||||
<script src="{{asset('assets/js/countdown.js')}}"></script>
|
||||
<script src="{{asset('assets/js/window-scroll-action.js')}}"></script>
|
||||
<script src="{{asset('assets/js/fitvid.js')}}"></script>
|
||||
<script src="{{asset('assets/js/youtube-bg.js')}}"></script>
|
||||
<script src="{{asset('assets/js/custom.js')}}"></script>
|
||||
<script async="" defer="" src="{{asset('assets/js/js.js')}}"></script>
|
||||
@includeUnless(isset($withoutFooter),'layouts.footer')
|
||||
|
||||
</body>
|
||||
</html>
|
||||
<script src="{{asset('assets/js/jquery-3.7.1.min.js')}}"></script>
|
||||
<script src="{{asset('assets/js/moment.js')}}"></script>
|
||||
<script src="{{asset('assets/js/bootstrap.js')}}"></script>
|
||||
<script src="{{asset('assets/js/owl-carousel.js')}}"></script>
|
||||
<script src="{{asset('assets/js/blur-area.js')}}"></script>
|
||||
<script src="{{asset('assets/js/icheck.js')}}"></script>
|
||||
<script src="{{asset('assets/js/gmap.js')}}"></script>
|
||||
<script src="{{asset('assets/js/magnific-popup.js')}}"></script>
|
||||
<script src="{{asset('assets/js/ion-range-slider.js')}}"></script>
|
||||
<script src="{{asset('assets/js/sticky-kit.js')}}"></script>
|
||||
<script src="{{asset('assets/js/smooth-scroll.js')}}"></script>
|
||||
<script src="{{asset('assets/js/fotorama.js')}}"></script>
|
||||
<script src="{{asset('assets/js/bs-datepicker.js')}}"></script>
|
||||
<script src="{{asset('assets/js/typeahead.js')}}"></script>
|
||||
<script src="{{asset('assets/js/quantity-selector.js')}}"></script>
|
||||
<script src="{{asset('assets/js/countdown.js')}}"></script>
|
||||
<script src="{{asset('assets/js/window-scroll-action.js')}}"></script>
|
||||
<script src="{{asset('assets/js/fitvid.js')}}"></script>
|
||||
<script src="{{asset('assets/js/youtube-bg.js')}}"></script>
|
||||
<script src="{{asset('assets/js/custom.js')}}"></script>
|
||||
<script async="" defer="" src="{{asset('assets/js/js.js')}}"></script>
|
||||
|
||||
@stack('scripts')
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
@extends('layouts.app')
|
||||
@extends('layouts.app')
|
||||
|
||||
@section('content')
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
<div class="card h-100 shadow-sm border-0 rounded-4 overflow-hidden">
|
||||
|
||||
<div class="position-relative">
|
||||
<div class="position-relative">
|
||||
|
||||
<img
|
||||
src="{{ getImageUrl($tour->image) }}"
|
||||
@@ -31,13 +31,13 @@
|
||||
>
|
||||
|
||||
<span class="position-absolute top-0 end-0 m-3 badge bg-primary">
|
||||
تور
|
||||
</span>
|
||||
تور
|
||||
</span>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div class="card-body d-flex flex-column">
|
||||
<div class="card-body d-flex flex-column">
|
||||
|
||||
<h5 class="fw-bold mb-3">
|
||||
{{ $tour->title }}
|
||||
@@ -61,14 +61,6 @@
|
||||
|
||||
</strong>
|
||||
|
||||
|
||||
<a
|
||||
href="{{ route('index') }}"
|
||||
class="btn btn-outline-primary rounded-pill px-4"
|
||||
>
|
||||
برگشت
|
||||
</a>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@@ -81,10 +73,18 @@
|
||||
|
||||
</div>
|
||||
|
||||
<div class="mt-4 d-flex justify-content-center">
|
||||
<a
|
||||
href="{{ route('index') }}"
|
||||
class="btn btn-outline-primary rounded-pill px-4"
|
||||
>
|
||||
برگشت
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<div class="mt-5 d-flex justify-content-center">
|
||||
<div class="mt-5 d-flex justify-content-center">
|
||||
|
||||
{{ $tours->links() }}
|
||||
{{$tours->links()}}
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
@@ -199,9 +199,9 @@
|
||||
|
||||
<div class="d-flex justify-content-between">
|
||||
|
||||
<strong>
|
||||
{{ $comment->user?->name ?? 'کاربر مهمان' }}
|
||||
</strong>
|
||||
<strong>
|
||||
{{ $comment->user ? $comment->user->first_name . ' ' . $comment->user->last_name : 'کاربر مهمان' }}
|
||||
</strong>
|
||||
|
||||
|
||||
<small>
|
||||
|
||||
Reference in New Issue
Block a user