Merge branch 'develop'

app/Http/Controllers/Profile/ProfileBillingController.php

@@ -23,9 +23,15 @@ class ProfileBillingController extends Controller
             })
             ->get()
             ->transform(function (Package $package) {
-                $symbol = $package->currency === Package::CURRENCY_EURO ? '€' : '$';
+                $currencies = [
+                    Package::CURRENCY_EURO => '€',
+                    Package::CURRENCY_USD => '$',
+                    Package::CURRENCY_NOK => 'KR ',
+                    Package::CURRENCY_CAD => 'CAD $',
+                    Package::CURRENCY_AUD => 'AUD $',
+                ];
 
-                $package->price_monthly = $symbol . number_format($package->price_monthly, 2, ',', '.');
+                $package->price_monthly = ($currencies[$package->currency] ?? '[Unknown currency]') . number_format($package->price_monthly, 2, ',', '.');
 
                 return $package;
             });

app/Models/Site.php

@@ -85,12 +85,12 @@ class Site extends Model
         if (setting('isolate_per_site_per_user') && $this->systemUsers()->first()) {
             $user = $this->systemUsers()->first();
         } else {
-            $user = $this->site->users()->first();
+            $user = $this->users()->first();
         }
 
         return [
-            'user_name' => $user->user_name,
-        ] + ($withPassword ? ['ftp_password' => $user->ftp_password] : []);
+                'user_name' => $user->user_name,
+            ] + ($withPassword ? ['ftp_password' => $user->ftp_password] : []);
     }
 
     public static function booted()
@@ -103,6 +103,19 @@ class Site extends Model
             foreach ($site->databases as $database) {
                 $database->delete();
             }
+
+            $ids = $site->systemUsers->pluck('id');
+            // Detach all db users
+            $site->systemUsers()->detach();
+
+            // Loop through ids an remove old users.
+            foreach ($ids as $id) {
+                $record = SiteSystemUser::find($id);
+                if ($record) {
+                    $record->delete();
+                }
+            }
+
             $site->redirects()->delete();
             $site->cronjobs()->delete();
             $site->certificates()->delete();