diff --git a/app/Http/Controllers/PoskodController.php b/app/Http/Controllers/PoskodController.php index 117a6fc..cf1f15a 100644 --- a/app/Http/Controllers/PoskodController.php +++ b/app/Http/Controllers/PoskodController.php @@ -92,17 +92,28 @@ class PoskodController extends Controller 'kodnegeri' => $request->kodnegeri ]); + $data = json_decode($response->body()); if(! $response->ok()){ - $message = str_replace("\"", "", $response->body()); + $error_detail = (array) $data->response->original; + + $message = $error_detail; + + $request->session()->flash('response_status', $response->ok()); + $request->session()->flash('response_message', $message); + + return redirect()->route('poskod.create'); + } else { $message = "Daftar poskod {$request->poskod} selesai"; + + $request->session()->flash('response_status', $response->ok()); + $request->session()->flash('response_message', $message); + + return redirect()->route('poskod.edit', $data->poskod); } - $request->session()->flash('response_status', $response->ok()); - $request->session()->flash('response_message', $message); - return redirect()->route('poskod.index', compact('message')); } @@ -153,18 +164,29 @@ class PoskodController extends Controller ]); + $data = json_decode($response->body()); + $request->session()->flash('response_status', $response->ok()); + if(! $response->ok()){ - $message = str_replace("\"", "", $response->body()); + $error_detail = (array) $data->response->original; + + $message = $error_detail; + + $request->session()->flash('response_message', $message); + + return redirect()->route('poskod.edit', $postcode); } else { - $message = "Kemaskini poskod {$postcode} kepada {$request->poskod} selesai"; + + $message = 'Kemaskini berjaya'; + + if(! empty($data->poskod_changes)){ + $message = $data->poskod_changes; + } + + $request->session()->flash('response_message', $message); + + return redirect()->route('poskod.edit', $data->poskod->poskod); } - - - $request->session()->flash('response_status', $response->ok()); - $request->session()->flash('response_message', $message); - - return redirect()->route('poskod.index', compact('message')); - return redirect()->route('poskod.index', compact('message')); } diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index d6fdc98..cf829a9 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -226,20 +226,24 @@