From e31a785844ac1d98b4b7d89f08a39b826484eb3b Mon Sep 17 00:00:00 2001 From: cp6 Date: Wed, 9 Nov 2022 15:18:25 +1100 Subject: [PATCH] Updated destroy() methods for delete condition Updated destroy() methods for delete condition If not true then return with the error alert --- app/Http/Controllers/DNSController.php | 11 ++++++---- app/Http/Controllers/DomainsController.php | 19 +++++++++------- app/Http/Controllers/IPsController.php | 8 ++++--- app/Http/Controllers/LabelsController.php | 13 ++++++----- app/Http/Controllers/LocationsController.php | 10 ++++++--- app/Http/Controllers/MiscController.php | 17 +++++++++------ app/Http/Controllers/OsController.php | 10 ++++++--- app/Http/Controllers/ProvidersController.php | 10 ++++++--- app/Http/Controllers/ResellerController.php | 22 +++++++++++-------- app/Http/Controllers/SeedBoxesController.php | 19 +++++++++------- app/Http/Controllers/ServerController.php | 17 +++++++++------ app/Http/Controllers/SharedController.php | 21 ++++++++++-------- app/Http/Controllers/YabsController.php | 23 +++++++++++--------- 13 files changed, 121 insertions(+), 79 deletions(-) diff --git a/app/Http/Controllers/DNSController.php b/app/Http/Controllers/DNSController.php index a324a60..4876c36 100644 --- a/app/Http/Controllers/DNSController.php +++ b/app/Http/Controllers/DNSController.php @@ -123,13 +123,16 @@ class DNSController extends Controller public function destroy(DNS $dn) { - $dn->delete(); + if ( $dn->delete()){ + Cache::forget('dns_count'); - Cache::forget('dns_count'); + Labels::deleteLabelsAssignedTo($dn->id); - Labels::deleteLabelsAssignedTo($dn->id); + return redirect()->route('dns.index') + ->with('success', 'DNS was deleted Successfully.'); + } return redirect()->route('dns.index') - ->with('success', 'DNS was deleted Successfully.'); + ->with('error', 'DNS was not deleted.'); } } diff --git a/app/Http/Controllers/DomainsController.php b/app/Http/Controllers/DomainsController.php index ed252aa..4c217a7 100644 --- a/app/Http/Controllers/DomainsController.php +++ b/app/Http/Controllers/DomainsController.php @@ -127,19 +127,22 @@ class DomainsController extends Controller public function destroy(Domains $domain) { - $domain->delete(); + if ($domain->delete()){ + $p = new Pricing(); + $p->deletePricing($domain->id); - $p = new Pricing(); - $p->deletePricing($domain->id); + Labels::deleteLabelsAssignedTo($domain->id); - Labels::deleteLabelsAssignedTo($domain->id); + Cache::forget("all_domains"); + Cache::forget("domain.{$domain->id}"); + Home::homePageCacheForget(); - Cache::forget("all_domains"); - Cache::forget("domain.{$domain->id}"); - Home::homePageCacheForget(); + return redirect()->route('domains.index') + ->with('success', 'Domain was deleted Successfully.'); + } return redirect()->route('domains.index') - ->with('success', 'Domain was deleted Successfully.'); + ->with('error', 'Domain was not deleted.'); } } diff --git a/app/Http/Controllers/IPsController.php b/app/Http/Controllers/IPsController.php index 653c3dd..611da9f 100644 --- a/app/Http/Controllers/IPsController.php +++ b/app/Http/Controllers/IPsController.php @@ -53,9 +53,11 @@ class IPsController extends Controller public function destroy(IPs $IP) { - $IP->delete(); - + if ($IP->delete()) { + return redirect()->route('IPs.index') + ->with('success', 'IP address was deleted Successfully.'); + } return redirect()->route('IPs.index') - ->with('success', 'IP address was deleted Successfully.'); + ->with('error', 'IP was not deleted.'); } } diff --git a/app/Http/Controllers/LabelsController.php b/app/Http/Controllers/LabelsController.php index adbb24e..5a77099 100644 --- a/app/Http/Controllers/LabelsController.php +++ b/app/Http/Controllers/LabelsController.php @@ -61,15 +61,18 @@ class LabelsController extends Controller public function destroy(Labels $label) { - $label->delete(); + if ($label->delete()) { + Cache::forget('labels_count'); - Cache::forget('labels_count'); + Labels::deleteLabelAssignedAs($label->id); - Labels::deleteLabelAssignedAs($label->id); + Cache::forget('all_labels'); - Cache::forget('all_labels'); + return redirect()->route('labels.index') + ->with('success', 'Label was deleted Successfully.'); + } return redirect()->route('labels.index') - ->with('success', 'Label was deleted Successfully.'); + ->with('error', 'Label was not deleted.'); } } diff --git a/app/Http/Controllers/LocationsController.php b/app/Http/Controllers/LocationsController.php index c8f362a..74b5453 100644 --- a/app/Http/Controllers/LocationsController.php +++ b/app/Http/Controllers/LocationsController.php @@ -61,11 +61,15 @@ class LocationsController extends Controller public function destroy(Locations $location) { - $location->delete(); + if ($location->delete()){ + Cache::forget('locations'); - Cache::forget('locations'); + return redirect()->route('locations.index') + ->with('success', 'Location was deleted Successfully.'); + } return redirect()->route('locations.index') - ->with('success', 'Location was deleted Successfully.'); + ->with('error', 'Location was not deleted.'); + } } diff --git a/app/Http/Controllers/MiscController.php b/app/Http/Controllers/MiscController.php index e16f52d..5d025c2 100644 --- a/app/Http/Controllers/MiscController.php +++ b/app/Http/Controllers/MiscController.php @@ -94,16 +94,19 @@ class MiscController extends Controller public function destroy(Misc $misc) { - $misc->delete(); + if ($misc->delete()) { + $p = new Pricing(); + $p->deletePricing($misc->id); - $p = new Pricing(); - $p->deletePricing($misc->id); + Cache::forget("all_misc"); + Cache::forget("misc.{$misc->id}"); + Home::homePageCacheForget(); - Cache::forget("all_misc"); - Cache::forget("misc.{$misc->id}"); - Home::homePageCacheForget(); + return redirect()->route('misc.index') + ->with('success', 'Misc service was deleted Successfully.'); + } return redirect()->route('misc.index') - ->with('success', 'Misc service was deleted Successfully.'); + ->with('error', 'Misc service was not deleted.'); } } diff --git a/app/Http/Controllers/OsController.php b/app/Http/Controllers/OsController.php index 32d1050..689b6ec 100644 --- a/app/Http/Controllers/OsController.php +++ b/app/Http/Controllers/OsController.php @@ -37,11 +37,15 @@ class OsController extends Controller public function destroy(OS $o) { - $o->delete(); + if ($o->delete()) { + Cache::forget('operating_systems'); - Cache::forget('operating_systems'); + return redirect()->route('os.index') + ->with('success', 'OS was deleted Successfully.'); + } return redirect()->route('os.index') - ->with('success', 'OS was deleted Successfully.'); + ->with('error', 'OS was not deleted.'); + } } diff --git a/app/Http/Controllers/ProvidersController.php b/app/Http/Controllers/ProvidersController.php index 32f94ce..1bafae1 100644 --- a/app/Http/Controllers/ProvidersController.php +++ b/app/Http/Controllers/ProvidersController.php @@ -46,12 +46,16 @@ class ProvidersController extends Controller public function destroy(Providers $provider) { - $provider->delete(); + if ($provider->delete()) { + Cache::forget('providers'); - Cache::forget('providers'); + return redirect()->route('providers.index') + ->with('success', 'Provider was deleted Successfully.'); + } return redirect()->route('providers.index') - ->with('success', 'Provider was deleted Successfully.'); + ->with('error', 'Provider was not deleted.'); + } } diff --git a/app/Http/Controllers/ResellerController.php b/app/Http/Controllers/ResellerController.php index 9a288dc..4066b44 100644 --- a/app/Http/Controllers/ResellerController.php +++ b/app/Http/Controllers/ResellerController.php @@ -174,20 +174,24 @@ class ResellerController extends Controller public function destroy(Reseller $reseller) { - $reseller->delete(); + if ($reseller->delete()) { + $p = new Pricing(); + $p->deletePricing($reseller->id); - $p = new Pricing(); - $p->deletePricing($reseller->id); + Labels::deleteLabelsAssignedTo($reseller->id); - Labels::deleteLabelsAssignedTo($reseller->id); + IPs::deleteIPsAssignedTo($reseller->id); - IPs::deleteIPsAssignedTo($reseller->id); + Cache::forget("all_reseller"); + Cache::forget("reseller_hosting.$reseller->id"); + Home::homePageCacheForget(); - Cache::forget("all_reseller"); - Cache::forget("reseller_hosting.$reseller->id"); - Home::homePageCacheForget(); + return redirect()->route('reseller.index') + ->with('success', 'Reseller hosting was deleted Successfully.'); + } return redirect()->route('reseller.index') - ->with('success', 'Reseller hosting was deleted Successfully.'); + ->with('error', 'Reseller was not deleted.'); + } } diff --git a/app/Http/Controllers/SeedBoxesController.php b/app/Http/Controllers/SeedBoxesController.php index c4434db..2ca1821 100644 --- a/app/Http/Controllers/SeedBoxesController.php +++ b/app/Http/Controllers/SeedBoxesController.php @@ -146,18 +146,21 @@ class SeedBoxesController extends Controller public function destroy(SeedBoxes $seedbox) { - $seedbox->delete(); + if ($seedbox->delete()) { + $p = new Pricing(); + $p->deletePricing($seedbox->id); - $p = new Pricing(); - $p->deletePricing( $seedbox->id); + Labels::deleteLabelsAssignedTo($seedbox->id); - Labels::deleteLabelsAssignedTo( $seedbox->id); + Cache::forget("all_seedboxes"); + Cache::forget("seedbox.{$seedbox->id}"); + Home::homePageCacheForget(); - Cache::forget("all_seedboxes"); - Cache::forget("seedbox.{$seedbox->id}"); - Home::homePageCacheForget(); + return redirect()->route('seedboxes.index') + ->with('success', 'Seed box was deleted Successfully.'); + } return redirect()->route('seedboxes.index') - ->with('success', 'Seed box was deleted Successfully.'); + ->with('error', 'Seed box was not deleted.'); } } diff --git a/app/Http/Controllers/ServerController.php b/app/Http/Controllers/ServerController.php index 4871aa7..7622eb5 100644 --- a/app/Http/Controllers/ServerController.php +++ b/app/Http/Controllers/ServerController.php @@ -199,19 +199,22 @@ class ServerController extends Controller public function destroy(Server $server) { - $server->delete(); + if ($server->delete()) { + $p = new Pricing(); + $p->deletePricing($server->id); - $p = new Pricing(); - $p->deletePricing($server->id); + Labels::deleteLabelsAssignedTo($server->id); - Labels::deleteLabelsAssignedTo($server->id); + IPs::deleteIPsAssignedTo($server->id); - IPs::deleteIPsAssignedTo($server->id); + Server::serverRelatedCacheForget(); - Server::serverRelatedCacheForget(); + return redirect()->route('servers.index') + ->with('success', 'Server was deleted Successfully.'); + } return redirect()->route('servers.index') - ->with('success', 'Server was deleted Successfully.'); + ->with('error', 'Server was not deleted.'); } public function chooseCompare() diff --git a/app/Http/Controllers/SharedController.php b/app/Http/Controllers/SharedController.php index ce45ba5..7f90a8b 100644 --- a/app/Http/Controllers/SharedController.php +++ b/app/Http/Controllers/SharedController.php @@ -168,21 +168,24 @@ class SharedController extends Controller public function destroy(Shared $shared) { - $shared->delete(); + if ($shared->delete()) { + $p = new Pricing(); + $p->deletePricing($shared->id); - $p = new Pricing(); - $p->deletePricing($shared->id); + Labels::deleteLabelsAssignedTo($shared->id); - Labels::deleteLabelsAssignedTo($shared->id); + IPs::deleteIPsAssignedTo($shared->id); - IPs::deleteIPsAssignedTo($shared->id); + Cache::forget("shared_hosting.$shared->id"); + Cache::forget('all_shared'); + Home::homePageCacheForget(); - Cache::forget("shared_hosting.$shared->id"); - Cache::forget('all_shared'); - Home::homePageCacheForget(); + return redirect()->route('shared.index') + ->with('success', 'Shared hosting was deleted Successfully.'); + } return redirect()->route('shared.index') - ->with('success', 'Shared hosting was deleted Successfully.'); + ->with('error', 'Shared was not deleted.'); } } diff --git a/app/Http/Controllers/YabsController.php b/app/Http/Controllers/YabsController.php index ccc28e7..4574ea0 100644 --- a/app/Http/Controllers/YabsController.php +++ b/app/Http/Controllers/YabsController.php @@ -32,26 +32,29 @@ class YabsController extends Controller public function destroy(Yabs $yab) { - $yab->delete(); + if ($yab->delete()) { + if (Server::serverYabsAmount($yab->server_id) === 0) { + DB::table('servers') + ->where('id', $yab->server_id) + ->update(['has_yabs' => 0]); + } - if (Server::serverYabsAmount($yab->server_id) === 0) { - DB::table('servers') - ->where('id', $yab->server_id) - ->update(['has_yabs' => 0]); + Cache::forget('all_yabs'); + Cache::forget("yabs.{$yab->id}"); + + return redirect()->route('yabs.index') + ->with('success', 'YABS was deleted Successfully.'); } - Cache::forget('all_yabs'); - Cache::forget("yabs.{$yab->id}"); - return redirect()->route('yabs.index') - ->with('success', 'YABS was deleted Successfully.'); + ->with('error', 'YABS was not deleted.'); } public function chooseYabsCompare() { $all_yabs = Yabs::allYabs(); - if (isset($all_yabs[1])){ + if (isset($all_yabs[1])) { return view('yabs.choose-compare', compact('all_yabs')); }