refactor AdditionalController and FotoController to remove commented code and improve readability
This commit is contained in:
parent
3ffa8ee33a
commit
95bc0ae157
|
|
@ -26,16 +26,13 @@ public function store(Request $request)
|
||||||
'nama' => 'nama additional',
|
'nama' => 'nama additional',
|
||||||
'harga' => 'harga additional',
|
'harga' => 'harga additional',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
if ($validator->fails()) {
|
if ($validator->fails()) {
|
||||||
return redirect()->back()
|
return redirect()->back()
|
||||||
->withErrors($validator)
|
->withErrors($validator)
|
||||||
->withInput()
|
->withInput()
|
||||||
->with('error_modal', 'createAdd'); // Membuka modal tambah additional
|
->with('error_modal', 'createAdd');
|
||||||
}
|
}
|
||||||
|
|
||||||
Additional::create($request->only(['nama', 'harga']));
|
Additional::create($request->only(['nama', 'harga']));
|
||||||
|
|
||||||
return redirect()->back()->with('success', 'Additional berhasil ditambahkan!');
|
return redirect()->back()->with('success', 'Additional berhasil ditambahkan!');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -43,7 +40,6 @@ public function store(Request $request)
|
||||||
public function update(Request $request, string $id)
|
public function update(Request $request, string $id)
|
||||||
{
|
{
|
||||||
$additional = Additional::findOrFail($id);
|
$additional = Additional::findOrFail($id);
|
||||||
|
|
||||||
$validator = Validator::make($request->all(), [
|
$validator = Validator::make($request->all(), [
|
||||||
'nama' => 'required|string|min:3|max:100',
|
'nama' => 'required|string|min:3|max:100',
|
||||||
'harga' => 'required|numeric|min:0',
|
'harga' => 'required|numeric|min:0',
|
||||||
|
|
@ -58,16 +54,13 @@ public function update(Request $request, string $id)
|
||||||
'nama' => 'nama additional',
|
'nama' => 'nama additional',
|
||||||
'harga' => 'harga additional',
|
'harga' => 'harga additional',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
if ($validator->fails()) {
|
if ($validator->fails()) {
|
||||||
return redirect()->back()
|
return redirect()->back()
|
||||||
->withErrors($validator)
|
->withErrors($validator)
|
||||||
->withInput()
|
->withInput()
|
||||||
->with('error_id_add', $id); // Membuka modal edit additional
|
->with('error_id_add', $id);
|
||||||
}
|
}
|
||||||
|
|
||||||
$additional->update($request->only(['nama', 'harga']));
|
$additional->update($request->only(['nama', 'harga']));
|
||||||
|
|
||||||
return redirect()->back()->with('success', 'Additional berhasil diperbarui!');
|
return redirect()->back()->with('success', 'Additional berhasil diperbarui!');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,8 +18,6 @@ public function index()
|
||||||
{
|
{
|
||||||
$foto = PaketFoto::latest()->get();
|
$foto = PaketFoto::latest()->get();
|
||||||
$additional = Additional::latest()->get();
|
$additional = Additional::latest()->get();
|
||||||
|
|
||||||
// Kirim keduanya ke view paket-foto.index
|
|
||||||
return view('admin.paket-foto.index', compact('foto', 'additional'));
|
return view('admin.paket-foto.index', compact('foto', 'additional'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -48,47 +46,25 @@ public function store(Request $request)
|
||||||
'durasi' => 'durasi paket',
|
'durasi' => 'durasi paket',
|
||||||
'foto' => 'foto paket',
|
'foto' => 'foto paket',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
if ($validator->fails()) {
|
if ($validator->fails()) {
|
||||||
return redirect()->back()
|
return redirect()->back()
|
||||||
->withErrors($validator)
|
->withErrors($validator)
|
||||||
->withInput()
|
->withInput()
|
||||||
->with('error_modal', 'createFoto'); // Agar modal terbuka otomatis saat error
|
->with('error_modal', 'createFoto');
|
||||||
}
|
}
|
||||||
|
|
||||||
// $path = null;
|
|
||||||
// if ($request->hasFile('foto')) {
|
|
||||||
// $file = $request->file('foto');
|
|
||||||
// $filename = time() . '_' . $file->getClientOriginalName();
|
|
||||||
// $path = $file->storeAs('img/foto', $filename, 'public');
|
|
||||||
// }
|
|
||||||
|
|
||||||
// PaketFoto::create([
|
|
||||||
// 'nama' => $request->nama,
|
|
||||||
// 'harga' => $request->harga,
|
|
||||||
// 'durasi' => $request->durasi,
|
|
||||||
// 'deskripsi' => $request->deskripsi,
|
|
||||||
// 'foto' => $path,
|
|
||||||
// ]);
|
|
||||||
|
|
||||||
// return redirect()->back()->with('success', 'Paket foto baru berhasil ditambahkan!');
|
|
||||||
|
|
||||||
if (!$request->hasFile('foto')) {
|
if (!$request->hasFile('foto')) {
|
||||||
return redirect()->back()
|
return redirect()->back()
|
||||||
->with('error', 'File foto tidak ditemukan!')
|
->with('error', 'File foto tidak ditemukan!')
|
||||||
->withInput();
|
->withInput();
|
||||||
}
|
}
|
||||||
|
|
||||||
$file = $request->file('foto');
|
$file = $request->file('foto');
|
||||||
$filename = time() . '_' . $file->getClientOriginalName();
|
$filename = time() . '_' . $file->getClientOriginalName();
|
||||||
$path = $file->storeAs('img/foto', $filename, 'public');
|
$path = $file->storeAs('img/foto', $filename, 'public');
|
||||||
|
|
||||||
if (!$path) {
|
if (!$path) {
|
||||||
return redirect()->back()
|
return redirect()->back()
|
||||||
->with('error', 'Gagal upload file!')
|
->with('error', 'Gagal upload file!')
|
||||||
->withInput();
|
->withInput();
|
||||||
}
|
}
|
||||||
|
|
||||||
PaketFoto::create([
|
PaketFoto::create([
|
||||||
'nama' => $request->nama,
|
'nama' => $request->nama,
|
||||||
'harga' => $request->harga,
|
'harga' => $request->harga,
|
||||||
|
|
@ -96,14 +72,12 @@ public function store(Request $request)
|
||||||
'deskripsi' => $request->deskripsi,
|
'deskripsi' => $request->deskripsi,
|
||||||
'foto' => $path,
|
'foto' => $path,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
return redirect()->back()->with('success', 'Paket foto baru berhasil ditambahkan!');
|
return redirect()->back()->with('success', 'Paket foto baru berhasil ditambahkan!');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function update(Request $request, string $id)
|
public function update(Request $request, string $id)
|
||||||
{
|
{
|
||||||
$paket = PaketFoto::findOrFail($id);
|
$paket = PaketFoto::findOrFail($id);
|
||||||
|
|
||||||
$validator = Validator::make($request->all(), [
|
$validator = Validator::make($request->all(), [
|
||||||
'nama' => 'required|string|min:3|max:100',
|
'nama' => 'required|string|min:3|max:100',
|
||||||
'harga' => 'required|numeric|min:0',
|
'harga' => 'required|numeric|min:0',
|
||||||
|
|
@ -126,29 +100,23 @@ public function update(Request $request, string $id)
|
||||||
'durasi' => 'durasi paket',
|
'durasi' => 'durasi paket',
|
||||||
'foto' => 'foto paket',
|
'foto' => 'foto paket',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
if ($validator->fails()) {
|
if ($validator->fails()) {
|
||||||
return redirect()->back()
|
return redirect()->back()
|
||||||
->withErrors($validator)
|
->withErrors($validator)
|
||||||
->withInput()
|
->withInput()
|
||||||
->with('error_id_foto', $id); // Membuka modal edit yang error otomatis
|
->with('error_id_foto', $id);
|
||||||
}
|
}
|
||||||
|
|
||||||
$data = $request->only(['nama', 'harga', 'durasi', 'deskripsi']);
|
$data = $request->only(['nama', 'harga', 'durasi', 'deskripsi']);
|
||||||
|
|
||||||
if ($request->hasFile('foto')) {
|
if ($request->hasFile('foto')) {
|
||||||
if ($paket->foto) {
|
if ($paket->foto) {
|
||||||
Storage::disk('public')->delete($paket->foto);
|
Storage::disk('public')->delete($paket->foto);
|
||||||
}
|
}
|
||||||
|
|
||||||
$file = $request->file('foto');
|
$file = $request->file('foto');
|
||||||
$filename = time() . '_' . $file->getClientOriginalName();
|
$filename = time() . '_' . $file->getClientOriginalName();
|
||||||
$path = $file->storeAs('img/foto', $filename, 'public');
|
$path = $file->storeAs('img/foto', $filename, 'public');
|
||||||
$data['foto'] = $path;
|
$data['foto'] = $path;
|
||||||
}
|
}
|
||||||
|
|
||||||
$paket->update($data);
|
$paket->update($data);
|
||||||
|
|
||||||
return redirect()->back()->with('success', 'Paket foto berhasil diperbarui!');
|
return redirect()->back()->with('success', 'Paket foto berhasil diperbarui!');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue