fix : complete Activity log in admin side
This commit is contained in:
@@ -107,28 +107,24 @@ class TourController extends Controller
|
||||
$fileId = $uploadedFile->id;
|
||||
}
|
||||
|
||||
Tour::create([
|
||||
$tour = Tour::create([
|
||||
'title' => $request->input('title'),
|
||||
|
||||
'summary' => $request->input('summary'),
|
||||
|
||||
'description' => $request->input('description'),
|
||||
|
||||
'origin' => $request->input('origin'),
|
||||
|
||||
'destination' => $request->input('destination'),
|
||||
|
||||
'file_id' => $fileId,
|
||||
|
||||
'duration' => $request->input('duration'),
|
||||
|
||||
'departure_time' => $request->input('departure_time'),
|
||||
|
||||
'price' => $request->input('price'),
|
||||
|
||||
'status' => $request->input('status'),
|
||||
'created_by' => auth('admin')->id(),
|
||||
'updated_by' => auth('admin')->id(),
|
||||
]);
|
||||
|
||||
logActivity('tours', $tour->id, 'created');
|
||||
|
||||
|
||||
DB::commit();
|
||||
|
||||
} catch (\Exception $exception) {
|
||||
@@ -160,9 +156,16 @@ class TourController extends Controller
|
||||
}
|
||||
|
||||
|
||||
public function update(tourUpdateRequest $request, Tour $tour) {
|
||||
public function update(tourUpdateRequest $request, Tour $tour)
|
||||
{
|
||||
try {
|
||||
|
||||
$before = $tour->only([
|
||||
'title', 'summary', 'description', 'origin',
|
||||
'destination', 'file_id', 'duration', 'price',
|
||||
'departure_time', 'status',
|
||||
]);
|
||||
|
||||
DB::beginTransaction();
|
||||
|
||||
$fileId = $tour->file_id;
|
||||
@@ -193,26 +196,21 @@ class TourController extends Controller
|
||||
|
||||
$tour->update([
|
||||
'title' => $request->input('title'),
|
||||
|
||||
'summary' => $request->input('summary'),
|
||||
|
||||
'description' => $request->input('description'),
|
||||
|
||||
'origin' => $request->input('origin'),
|
||||
|
||||
'destination' => $request->input('destination'),
|
||||
|
||||
'file_id' => $fileId,
|
||||
|
||||
'duration' => $request->input('duration'),
|
||||
|
||||
'views' => 0,
|
||||
|
||||
'departure_time' => $request->input('departure_time'),
|
||||
|
||||
'price' => $request->input('price'),
|
||||
|
||||
'status' => $request->input('status'),
|
||||
'updated_by' => auth('admin')->id(),
|
||||
]);
|
||||
|
||||
logActivity('tours', $tour->id, 'updated', [
|
||||
'before' => $before,
|
||||
'after' => $tour->only(array_keys($before)),
|
||||
]);
|
||||
|
||||
DB::commit();
|
||||
@@ -237,15 +235,16 @@ class TourController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
public function destroy(Tour $tour)
|
||||
{
|
||||
if ($tour->bookings()->exists()) {
|
||||
return back()->withErrors(['error' => 'این پرواز دارای رزرو است و قابل حذف نیست.']);
|
||||
}
|
||||
|
||||
logActivity('flights', $tour->id, 'deleted');
|
||||
|
||||
$tour->delete();
|
||||
|
||||
return redirect()
|
||||
->route('admin.tours.index')
|
||||
->withErrors([
|
||||
'success' => 'تور با موفقیت حذف شد'
|
||||
]);
|
||||
return redirect()->route('admin.flights.index')->withErrors(['success'=> 'پرواز با موفقیت حذف شد']);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user