Merge branch 'develop'

User deleting fix
2021-05-31 15:55:32 +02:00 · 2021-05-31 15:53:58 +02:00 · 2021-05-31 08:55:21 +02:00 · 2021-05-31 08:55:15 +02:00 · 2021-05-25 07:37:34 +02:00 · 2021-05-25 07:37:28 +02:00
16 changed files with 190 additions and 116 deletions
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -8,6 +8,7 @@ use App\Http\Controllers\Controller;
 use App\Providers\RouteServiceProvider;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Foundation\Auth\RegistersUsers;
+use Illuminate\Validation\Rules\Password;

 class RegisterController extends Controller
 {
@@ -30,7 +31,15 @@ class RegisterController extends Controller
        return Validator::make($data, [
            'name' => ['required', 'string', 'max:255'],
            'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
-            'password' => ['required', 'string', 'min:8', 'confirmed'],
+            'password' => [
+                'required',
+                'string',
+                'confirmed',
+                Password::min(6)
+                    ->letters()
+                    ->numbers()
+                    ->uncompromised()
+            ],
        ]);
    }

--- a/app/Http/Controllers/Profile/ProfileBillingController.php
+++ b/app/Http/Controllers/Profile/ProfileBillingController.php
@@ -53,17 +53,9 @@ class ProfileBillingController extends Controller
            })
            ->get()
            ->transform(function (Package $package) {
-                $currencies = [
-                    Package::CURRENCY_EURO => '€',
-                    Package::CURRENCY_USD => '$',
-                    Package::CURRENCY_NOK => 'KR ',
-                    Package::CURRENCY_CAD => 'CAD $',
-                    Package::CURRENCY_AUD => 'AUD $',
-                    Package::CURRENCY_GBP => 'GBP £',
-                    Package::CURRENCY_INR => 'INR ',
-                ];
+                $currency = $this->transformCurrency($package->currency);

-                $package->price_monthly = ($currencies[$package->currency] ?? '[Unknown currency]') . number_format($package->price_monthly, 2, ',', '.');
+                $package->price_monthly = ($currency ?? '[Unknown currency]') . number_format($package->price_monthly, 2, ',', '.');

                return $package;
            });
@@ -175,7 +167,7 @@ class ProfileBillingController extends Controller
    public function invoices(Request $request)
    {
        return $request->user()->invoices()->map(function ($invoice) {
-            $symbol = $invoice->currency === Package::CURRENCY_EURO ? '€' : '$';
+            $symbol = $this->transformCurrency($invoice->currency);

            return [
                'id' => $invoice->id,
@@ -195,4 +187,19 @@ class ProfileBillingController extends Controller
            'product' => 'Webhosting'
        ]);
    }
+
+    protected function transformCurrency($key)
+    {
+        $currencies = [
+            Package::CURRENCY_EURO => '€',
+            Package::CURRENCY_USD => '$',
+            Package::CURRENCY_NOK => 'KR ',
+            Package::CURRENCY_CAD => 'CAD $',
+            Package::CURRENCY_AUD => 'AUD $',
+            Package::CURRENCY_GBP => 'GBP £',
+            Package::CURRENCY_INR => 'INR ₹',
+        ];
+
+        return $currencies[strtolower($key)];
+    }
 }
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -110,6 +110,11 @@ class User extends Authenticatable implements HasLocalePreference
        return $this->hasMany(SupportTicket::class);
    }

+    public function supportTicketReplies()
+    {
+        return $this->hasMany(SupportTicketReply::class);
+    }
+
    public function systemLogs()
    {
        return $this->hasMany(SystemLog::class);
@@ -139,6 +144,10 @@ class User extends Authenticatable implements HasLocalePreference
            $user->systemLogs()->delete();
            $user->servers()->detach();
            $user->sites()->detach();
+            foreach($user->supportTickets as $supportTicket){
+                $supportTicket->replies()->delete();
+            }
+            $user->supportTickets()->delete();
        });
    }
 }
--- a/app/Services/Ploi/Resources/Server.php
+++ b/app/Services/Ploi/Resources/Server.php
@@ -61,9 +61,9 @@ class Server extends Resource

    public function create(
        string $name,
-        int $provider,
-        int $region,
-        int $plan
+        $provider,
+        $region,
+        $plan
    ): stdClass {

        // Remove the id
@@ -89,8 +89,6 @@ class Server extends Resource
        } catch (NotValid $exception) {
            $errors = json_decode($exception->getMessage())->errors;

-            dd($errors);
-
            throw $exception;
        }

--- a/composer.lock
+++ b/composer.lock
@@ -1185,16 +1185,16 @@
        },
        {
            "name": "laravel/cashier",
-            "version": "v12.13.0",
+            "version": "v12.13.1",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/cashier-stripe.git",
-                "reference": "f1a7d5ffce278bf9c85cd3c1b86c45d688f3bf00"
+                "reference": "532089a487dd09c6fa5adaf9c0088715a7623e48"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/cashier-stripe/zipball/f1a7d5ffce278bf9c85cd3c1b86c45d688f3bf00",
-                "reference": "f1a7d5ffce278bf9c85cd3c1b86c45d688f3bf00",
+                "url": "https://api.github.com/repos/laravel/cashier-stripe/zipball/532089a487dd09c6fa5adaf9c0088715a7623e48",
+                "reference": "532089a487dd09c6fa5adaf9c0088715a7623e48",
                "shasum": ""
            },
            "require": {
@@ -1259,20 +1259,20 @@
                "issues": "https://github.com/laravel/cashier/issues",
                "source": "https://github.com/laravel/cashier"
            },
-            "time": "2021-04-27T17:42:05+00:00"
+            "time": "2021-05-11T20:52:30+00:00"
        },
        {
            "name": "laravel/framework",
-            "version": "v8.40.0",
+            "version": "v8.42.0",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "a654897ad7f97aea9d7ef292803939798c4a02a4"
+                "reference": "55b886683e0a019bcad0d9d70bb781a3de1a6755"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/a654897ad7f97aea9d7ef292803939798c4a02a4",
-                "reference": "a654897ad7f97aea9d7ef292803939798c4a02a4",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/55b886683e0a019bcad0d9d70bb781a3de1a6755",
+                "reference": "55b886683e0a019bcad0d9d70bb781a3de1a6755",
                "shasum": ""
            },
            "require": {
@@ -1380,7 +1380,7 @@
                "phpunit/phpunit": "Required to use assertions and run tests (^8.5.8|^9.3.3).",
                "predis/predis": "Required to use the predis connector (^1.1.2).",
                "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
-                "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0|^5.0).",
+                "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0|^5.0|^6.0).",
                "symfony/cache": "Required to PSR-6 cache bridge (^5.1.4).",
                "symfony/filesystem": "Required to enable support for relative symbolic links (^5.1.4).",
                "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^2.0).",
@@ -1427,20 +1427,20 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2021-04-28T14:38:56+00:00"
+            "time": "2021-05-18T15:37:44+00:00"
        },
        {
            "name": "laravel/horizon",
-            "version": "v5.7.6",
+            "version": "v5.7.7",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/horizon.git",
-                "reference": "24ffd819df749ef11a4eb20e14150b671d4f5717"
+                "reference": "6f3b522bf628852d180fabfeb3bddac69a4f6fca"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/horizon/zipball/24ffd819df749ef11a4eb20e14150b671d4f5717",
-                "reference": "24ffd819df749ef11a4eb20e14150b671d4f5717",
+                "url": "https://api.github.com/repos/laravel/horizon/zipball/6f3b522bf628852d180fabfeb3bddac69a4f6fca",
+                "reference": "6f3b522bf628852d180fabfeb3bddac69a4f6fca",
                "shasum": ""
            },
            "require": {
@@ -1502,9 +1502,9 @@
            ],
            "support": {
                "issues": "https://github.com/laravel/horizon/issues",
-                "source": "https://github.com/laravel/horizon/tree/v5.7.6"
+                "source": "https://github.com/laravel/horizon/tree/v5.7.7"
            },
-            "time": "2021-04-27T18:00:46+00:00"
+            "time": "2021-05-18T15:24:26+00:00"
        },
        {
            "name": "laravel/tinker",
@@ -1635,16 +1635,16 @@
        },
        {
            "name": "league/commonmark",
-            "version": "1.6.1",
+            "version": "1.6.2",
            "source": {
                "type": "git",
                "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "2651c497f005de305c7ba3f232cbd87b8c00ee8c"
+                "reference": "7d70d2f19c84bcc16275ea47edabee24747352eb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/2651c497f005de305c7ba3f232cbd87b8c00ee8c",
-                "reference": "2651c497f005de305c7ba3f232cbd87b8c00ee8c",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/7d70d2f19c84bcc16275ea47edabee24747352eb",
+                "reference": "7d70d2f19c84bcc16275ea47edabee24747352eb",
                "shasum": ""
            },
            "require": {
@@ -1732,7 +1732,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-05-08T16:08:00+00:00"
+            "time": "2021-05-12T11:39:41+00:00"
        },
        {
            "name": "league/flysystem",
@@ -2134,16 +2134,16 @@
        },
        {
            "name": "nesbot/carbon",
-            "version": "2.47.0",
+            "version": "2.48.0",
            "source": {
                "type": "git",
                "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "606262fd8888b75317ba9461825a24fc34001e1e"
+                "reference": "d3c447f21072766cddec3522f9468a5849a76147"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/606262fd8888b75317ba9461825a24fc34001e1e",
-                "reference": "606262fd8888b75317ba9461825a24fc34001e1e",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d3c447f21072766cddec3522f9468a5849a76147",
+                "reference": "d3c447f21072766cddec3522f9468a5849a76147",
                "shasum": ""
            },
            "require": {
@@ -2223,7 +2223,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-04-13T21:54:02+00:00"
+            "time": "2021-05-07T10:08:30+00:00"
        },
        {
            "name": "nikic/php-parser",
@@ -3549,16 +3549,16 @@
        },
        {
            "name": "symfony/console",
-            "version": "v5.2.7",
+            "version": "v5.2.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "90374b8ed059325b49a29b55b3f8bb4062c87629"
+                "reference": "864568fdc0208b3eba3638b6000b69d2386e6768"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/90374b8ed059325b49a29b55b3f8bb4062c87629",
-                "reference": "90374b8ed059325b49a29b55b3f8bb4062c87629",
+                "url": "https://api.github.com/repos/symfony/console/zipball/864568fdc0208b3eba3638b6000b69d2386e6768",
+                "reference": "864568fdc0208b3eba3638b6000b69d2386e6768",
                "shasum": ""
            },
            "require": {
@@ -3626,7 +3626,7 @@
                "terminal"
            ],
            "support": {
-                "source": "https://github.com/symfony/console/tree/v5.2.7"
+                "source": "https://github.com/symfony/console/tree/v5.2.8"
            },
            "funding": [
                {
@@ -3642,7 +3642,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-04-19T14:07:32+00:00"
+            "time": "2021-05-11T15:45:21+00:00"
        },
        {
            "name": "symfony/css-selector",
@@ -3778,16 +3778,16 @@
        },
        {
            "name": "symfony/error-handler",
-            "version": "v5.2.7",
+            "version": "v5.2.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/error-handler.git",
-                "reference": "ea3ddbf67615e883ca7c33a4de61213789846782"
+                "reference": "1416bc16317a8188aabde251afef7618bf4687ac"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/ea3ddbf67615e883ca7c33a4de61213789846782",
-                "reference": "ea3ddbf67615e883ca7c33a4de61213789846782",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/1416bc16317a8188aabde251afef7618bf4687ac",
+                "reference": "1416bc16317a8188aabde251afef7618bf4687ac",
                "shasum": ""
            },
            "require": {
@@ -3827,7 +3827,7 @@
            "description": "Provides tools to manage errors and ease debugging PHP code",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v5.2.7"
+                "source": "https://github.com/symfony/error-handler/tree/v5.2.8"
            },
            "funding": [
                {
@@ -3843,7 +3843,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-04-07T15:57:33+00:00"
+            "time": "2021-05-07T13:42:21+00:00"
        },
        {
            "name": "symfony/event-dispatcher",
@@ -4011,16 +4011,16 @@
        },
        {
            "name": "symfony/finder",
-            "version": "v5.2.4",
+            "version": "v5.2.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/finder.git",
-                "reference": "0d639a0943822626290d169965804f79400e6a04"
+                "reference": "eccb8be70d7a6a2230d05f6ecede40f3fdd9e252"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/0d639a0943822626290d169965804f79400e6a04",
-                "reference": "0d639a0943822626290d169965804f79400e6a04",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/eccb8be70d7a6a2230d05f6ecede40f3fdd9e252",
+                "reference": "eccb8be70d7a6a2230d05f6ecede40f3fdd9e252",
                "shasum": ""
            },
            "require": {
@@ -4052,7 +4052,7 @@
            "description": "Finds files and directories via an intuitive fluent interface",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/finder/tree/v5.2.4"
+                "source": "https://github.com/symfony/finder/tree/v5.2.8"
            },
            "funding": [
                {
@@ -4068,7 +4068,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-02-15T18:55:04+00:00"
+            "time": "2021-05-10T14:39:23+00:00"
        },
        {
            "name": "symfony/http-client-contracts",
@@ -4150,16 +4150,16 @@
        },
        {
            "name": "symfony/http-foundation",
-            "version": "v5.2.7",
+            "version": "v5.2.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "a416487a73bb9c9d120e9ba3a60547f4a3fb7a1f"
+                "reference": "e8fbbab7c4a71592985019477532629cb2e142dc"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/a416487a73bb9c9d120e9ba3a60547f4a3fb7a1f",
-                "reference": "a416487a73bb9c9d120e9ba3a60547f4a3fb7a1f",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e8fbbab7c4a71592985019477532629cb2e142dc",
+                "reference": "e8fbbab7c4a71592985019477532629cb2e142dc",
                "shasum": ""
            },
            "require": {
@@ -4203,7 +4203,7 @@
            "description": "Defines an object-oriented layer for the HTTP specification",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v5.2.7"
+                "source": "https://github.com/symfony/http-foundation/tree/v5.2.8"
            },
            "funding": [
                {
@@ -4219,20 +4219,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-05-01T13:46:24+00:00"
+            "time": "2021-05-07T13:41:16+00:00"
        },
        {
            "name": "symfony/http-kernel",
-            "version": "v5.2.7",
+            "version": "v5.2.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "1e9f6879f070f718e0055fbac232a56f67b8b6bd"
+                "reference": "c3cb71ee7e2d3eae5fe1001f81780d6a49b37937"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/1e9f6879f070f718e0055fbac232a56f67b8b6bd",
-                "reference": "1e9f6879f070f718e0055fbac232a56f67b8b6bd",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/c3cb71ee7e2d3eae5fe1001f81780d6a49b37937",
+                "reference": "c3cb71ee7e2d3eae5fe1001f81780d6a49b37937",
                "shasum": ""
            },
            "require": {
@@ -4315,7 +4315,7 @@
            "description": "Provides a structured process for converting a Request into a Response",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v5.2.7"
+                "source": "https://github.com/symfony/http-kernel/tree/v5.2.8"
            },
            "funding": [
                {
@@ -4331,7 +4331,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-05-01T14:53:15+00:00"
+            "time": "2021-05-12T13:27:53+00:00"
        },
        {
            "name": "symfony/mime",
@@ -5464,16 +5464,16 @@
        },
        {
            "name": "symfony/string",
-            "version": "v5.2.6",
+            "version": "v5.2.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/string.git",
-                "reference": "ad0bd91bce2054103f5eaa18ebeba8d3bc2a0572"
+                "reference": "01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/ad0bd91bce2054103f5eaa18ebeba8d3bc2a0572",
-                "reference": "ad0bd91bce2054103f5eaa18ebeba8d3bc2a0572",
+                "url": "https://api.github.com/repos/symfony/string/zipball/01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db",
+                "reference": "01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db",
                "shasum": ""
            },
            "require": {
@@ -5527,7 +5527,7 @@
                "utf8"
            ],
            "support": {
-                "source": "https://github.com/symfony/string/tree/v5.2.6"
+                "source": "https://github.com/symfony/string/tree/v5.2.8"
            },
            "funding": [
                {
@@ -5543,20 +5543,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-03-17T17:12:15+00:00"
+            "time": "2021-05-10T14:56:10+00:00"
        },
        {
            "name": "symfony/translation",
-            "version": "v5.2.7",
+            "version": "v5.2.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/translation.git",
-                "reference": "e37ece5242564bceea54d709eafc948377ec9749"
+                "reference": "445caa74a5986f1cc9dd91a2975ef68fa7cb2068"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/e37ece5242564bceea54d709eafc948377ec9749",
-                "reference": "e37ece5242564bceea54d709eafc948377ec9749",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/445caa74a5986f1cc9dd91a2975ef68fa7cb2068",
+                "reference": "445caa74a5986f1cc9dd91a2975ef68fa7cb2068",
                "shasum": ""
            },
            "require": {
@@ -5620,7 +5620,7 @@
            "description": "Provides tools to internationalize your application",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/translation/tree/v5.2.7"
+                "source": "https://github.com/symfony/translation/tree/v5.2.8"
            },
            "funding": [
                {
@@ -5636,7 +5636,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-04-01T08:15:21+00:00"
+            "time": "2021-05-07T13:41:16+00:00"
        },
        {
            "name": "symfony/translation-contracts",
@@ -5718,16 +5718,16 @@
        },
        {
            "name": "symfony/var-dumper",
-            "version": "v5.2.7",
+            "version": "v5.2.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "27cb9f7cfa3853c736425c7233a8f68814b19636"
+                "reference": "d693200a73fae179d27f8f1b16b4faf3e8569eba"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/27cb9f7cfa3853c736425c7233a8f68814b19636",
-                "reference": "27cb9f7cfa3853c736425c7233a8f68814b19636",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/d693200a73fae179d27f8f1b16b4faf3e8569eba",
+                "reference": "d693200a73fae179d27f8f1b16b4faf3e8569eba",
                "shasum": ""
            },
            "require": {
@@ -5786,7 +5786,7 @@
                "dump"
            ],
            "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v5.2.7"
+                "source": "https://github.com/symfony/var-dumper/tree/v5.2.8"
            },
            "funding": [
                {
@@ -5802,7 +5802,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-04-19T14:07:32+00:00"
+            "time": "2021-05-07T13:42:21+00:00"
        },
        {
            "name": "tightenco/ziggy",
@@ -6134,16 +6134,16 @@
    "packages-dev": [
        {
            "name": "barryvdh/laravel-debugbar",
-            "version": "v3.5.5",
+            "version": "v3.5.7",
            "source": {
                "type": "git",
                "url": "https://github.com/barryvdh/laravel-debugbar.git",
-                "reference": "6420113d90bb746423fa70b9940e9e7c26ebc121"
+                "reference": "88fd9cfa144b06b2549e9d487fdaec68265e791e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/6420113d90bb746423fa70b9940e9e7c26ebc121",
-                "reference": "6420113d90bb746423fa70b9940e9e7c26ebc121",
+                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/88fd9cfa144b06b2549e9d487fdaec68265e791e",
+                "reference": "88fd9cfa144b06b2549e9d487fdaec68265e791e",
                "shasum": ""
            },
            "require": {
@@ -6203,7 +6203,7 @@
            ],
            "support": {
                "issues": "https://github.com/barryvdh/laravel-debugbar/issues",
-                "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.5.5"
+                "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.5.7"
            },
            "funding": [
                {
@@ -6211,7 +6211,7 @@
                    "type": "github"
                }
            ],
-            "time": "2021-04-07T11:19:20+00:00"
+            "time": "2021-05-13T20:18:35+00:00"
        },
        {
            "name": "composer/semver",
@@ -6360,28 +6360,30 @@
        },
        {
            "name": "doctrine/annotations",
-            "version": "1.12.1",
+            "version": "1.13.1",
            "source": {
                "type": "git",
                "url": "https://github.com/doctrine/annotations.git",
-                "reference": "b17c5014ef81d212ac539f07a1001832df1b6d3b"
+                "reference": "e6e7b7d5b45a2f2abc5460cc6396480b2b1d321f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/b17c5014ef81d212ac539f07a1001832df1b6d3b",
-                "reference": "b17c5014ef81d212ac539f07a1001832df1b6d3b",
+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/e6e7b7d5b45a2f2abc5460cc6396480b2b1d321f",
+                "reference": "e6e7b7d5b45a2f2abc5460cc6396480b2b1d321f",
                "shasum": ""
            },
            "require": {
                "doctrine/lexer": "1.*",
                "ext-tokenizer": "*",
-                "php": "^7.1 || ^8.0"
+                "php": "^7.1 || ^8.0",
+                "psr/cache": "^1 || ^2 || ^3"
            },
            "require-dev": {
-                "doctrine/cache": "1.*",
+                "doctrine/cache": "^1.11 || ^2.0",
                "doctrine/coding-standard": "^6.0 || ^8.1",
                "phpstan/phpstan": "^0.12.20",
-                "phpunit/phpunit": "^7.5 || ^9.1.5"
+                "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5",
+                "symfony/cache": "^4.4 || ^5.2"
            },
            "type": "library",
            "autoload": {
@@ -6424,9 +6426,9 @@
            ],
            "support": {
                "issues": "https://github.com/doctrine/annotations/issues",
-                "source": "https://github.com/doctrine/annotations/tree/1.12.1"
+                "source": "https://github.com/doctrine/annotations/tree/1.13.1"
            },
-            "time": "2021-02-21T21:00:45+00:00"
+            "time": "2021-05-16T18:07:53+00:00"
        },
        {
            "name": "doctrine/instantiator",
@@ -8217,6 +8219,55 @@
            ],
            "time": "2021-03-23T07:16:29+00:00"
        },
+        {
+            "name": "psr/cache",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/cache.git",
+                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8",
+                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Cache\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for caching libraries",
+            "keywords": [
+                "cache",
+                "psr",
+                "psr-6"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/cache/tree/master"
+            },
+            "time": "2016-08-06T20:24:11+00:00"
+        },
        {
            "name": "sebastian/cli-parser",
            "version": "1.0.1",
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
        "watch": "mix watch",
        "watch-poll": "mix watch -- --watch-options-poll=1000",
        "hot": "mix watch --hot",
-        "production": "rm -rf ./public/js/*.js && mix --production"
+        "production": "mix --production"
    },
    "devDependencies": {
        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
--- a/public/js/1382.js
+++ b/public/js/1382.js
--- a/public/js/2076.js
+++ b/public/js/2076.js
--- a/public/js/3028.js
+++ b/public/js/3028.js
--- a/public/js/7566.js
+++ b/public/js/7566.js
--- a/public/js/app.js
+++ b/public/js/app.js
--- a/public/vendor/horizon/app.js
+++ b/public/vendor/horizon/app.js
--- a/public/vendor/horizon/mix-manifest.json
+++ b/public/vendor/horizon/mix-manifest.json
@@ -1,5 +1,5 @@
 {
-    "/app.js": "/app.js?id=8dd8716f3583c4b63da7",
+    "/app.js": "/app.js?id=341394f05bad274130fe",
    "/app-dark.css": "/app-dark.css?id=ade35296e4fa0c99a758",
    "/app.css": "/app.css?id=c14814cc1a7a4f298934",
    "/img/favicon.png": "/img/favicon.png?id=1542bfe8a0010dcbee71"
--- a/resources/js/Pages/Admin/Packages/Create.vue
+++ b/resources/js/Pages/Admin/Packages/Create.vue
@@ -35,7 +35,7 @@
                                            <option value="nok">{{ __('NOK (Norwegian Krone)') }}</option>
                                            <option value="aud">{{ __('AUD (Australian dollar)') }}</option>
                                            <option value="cad">{{ __('CAD (Canadian dollar)') }}</option>
-                                            <option value="inr">{{ __('INR (Indian rupee)') }}</option>
+                                            <option value="inr">{{ __('INR ₹ (Indian rupee)') }}</option>
                                        </FormSelect>

                                        <div class="space-y-4">
--- a/resources/js/Pages/Admin/Packages/Edit.vue
+++ b/resources/js/Pages/Admin/Packages/Edit.vue
@@ -37,7 +37,7 @@
                                            <option value="nok">{{ __('NOK (Norwegian Krone)') }}</option>
                                            <option value="aud">{{ __('AUD (Australian dollar)') }}</option>
                                            <option value="cad">{{ __('CAD (Canadian dollar)') }}</option>
-                                            <option value="inr">{{ __('INR (Indian rupee)') }}</option>
+                                            <option value="inr">{{ __('INR ₹ (Indian rupee)') }}</option>
                                        </FormSelect>

                                        <div class="space-y-4">
--- a/resources/views/app.blade.php
+++ b/resources/views/app.blade.php
@@ -4,7 +4,7 @@
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1">

-    <title>Ploi Core</title>
+    <title>{{ setting('name') }}</title>

    <link href="https://fonts.googleapis.com/css?family=Inter&display=swap" rel="stylesheet">
Author	SHA1	Message	Date
Dennis	b623dd80fd	Merge branch 'develop'	2021-05-31 15:55:32 +02:00
Dennis	3978a7c9f7	User deleting fix	2021-05-31 15:53:58 +02:00
Dennis	7d2acb7438	Merge branch 'develop'	2021-05-31 08:55:21 +02:00
Dennis	096032301c	Fix when deleting user with support tickets	2021-05-31 08:55:15 +02:00
Dennis	c3e99bf2ff	Merge branch 'develop'	2021-05-25 07:37:34 +02:00
Dennis	9795642bc7	Bugfix	2021-05-25 07:37:28 +02:00
Dennis	4281a432fb	Merge branch 'develop'	2021-05-22 09:36:29 +02:00
Dennis	18df5589b1	Fix title	2021-05-22 09:36:25 +02:00
Dennis	79536eac2e	Fresh mix	2021-05-19 09:38:13 +02:00
Dennis	6df82fca04	Clean push	2021-05-19 09:36:22 +02:00
Dennis	cc14123d27	Merge branch 'develop'	2021-05-19 09:36:04 +02:00
Dennis	bd5e7b87ff	Package update && password uncomprimised	2021-05-19 09:35:54 +02:00
Dennis	42568916d6	prod mix	2021-05-18 12:17:24 +02:00
Dennis	180803cd8a	Merge branch 'develop' # Conflicts: # public/js/app.js	2021-05-17 12:10:01 +02:00
Dennis	08fcb0ce01	Transform currencies properly	2021-05-17 12:07:52 +02:00