Merge branch 'v5-develop' into v5-stable

2025-07-09 03:14:30 -04:00 · 2021-05-02 22:49:24 +10:00 · 2021-05-02 22:49:24 +10:00 · 5ceaf58243
commit 5ceaf58243
parent c29d0fff1f a1d6c78642
19 changed files with 194580 additions and 193742 deletions
--- a/VERSION.txt
+++ b/VERSION.txt
@ -1 +1 @@
-5.1.57
+5.1.58
--- a/app/Console/Commands/PostUpdate.php
+++ b/app/Console/Commands/PostUpdate.php
@ -42,12 +42,12 @@ class PostUpdate extends Command
    {
        set_time_limit(0);

-        nlog('running post update');
+        info('running post update');

        try {
            Artisan::call('migrate', ['--force' => true]);
        } catch (\Exception $e) {
-            nlog("I wasn't able to migrate the data.");
+            info("I wasn't able to migrate the data.");
        }

        nlog("finished migrating");
@ -56,35 +56,28 @@ class PostUpdate extends Command

        exec('vendor/bin/composer install --no-dev -o', $output);

-        info(print_r($output,1));
-
-        nlog($output);
-        
-        nlog("finished running composer install ");
-
+        info(print_r($output,1));        
+        info("finished running composer install ");

        try {
            Artisan::call('optimize');
        } catch (\Exception $e) {
-            nlog("I wasn't able to optimize.");
+            info("I wasn't able to optimize.");
        }

-        nlog("optimized");
+        info("optimized");

        try {
            Artisan::call('view:clear');
        } catch (\Exception $e) {
-            nlog("I wasn't able to clear the views.");
+            info("I wasn't able to clear the views.");
        }

-        nlog("view cleared");
-
-        /* For the following to work, the web user (www-data) must own all the directories */
+        info("view cleared");

        VersionCheck::dispatch();

-        nlog("sent for version check");
+        info("Sent for version check");
        
-        // echo "Done.";
    }
 }
--- a/app/Factory/RecurringInvoiceToInvoiceFactory.php
+++ b/app/Factory/RecurringInvoiceToInvoiceFactory.php
@ -51,7 +51,8 @@ class RecurringInvoiceToInvoiceFactory
        $invoice->client_id = $client->id;
        $invoice->auto_bill_enabled = $recurring_invoice->auto_bill_enabled;
        $invoice->paid_to_date = 0;
-
+        $invoice->design_id = $recurring_invoice->design_id;
+        
        return $invoice;
    }
 }
--- a/app/Http/Controllers/LogoutController.php
+++ b/app/Http/Controllers/LogoutController.php
@ -59,9 +59,11 @@ class LogoutController extends BaseController
     */
    public function index(Request $request)
    {
-        CompanyToken::with('company')
+        $ct = CompanyToken::with('company.tokens')
                    ->whereRaw('BINARY `token`= ?', [$request->header('X-API-TOKEN')])
-                    ->company
+                    ->first();
+
+                    $ct->company
                    ->tokens()
                    ->where('is_system', true)
                    ->forceDelete();
--- a/app/Http/Controllers/SelfUpdateController.php
+++ b/app/Http/Controllers/SelfUpdateController.php
@ -62,21 +62,16 @@ class SelfUpdateController extends BaseController
            return response()->json(['message' => ctrans('texts.self_update_not_available')], 403);
        }

-        if(!$this->testWritable())
-            throw new FilePermissionsFailure('Cannot update system because files are not writable!');
+        $this->testWritable();

-        // Check if new version is available
-        //if($updater->source()->isNewVersionAvailable()) {
+        // Get the new version available
+        $versionAvailable = $updater->source()->getVersionAvailable();

-            // Get the new version available
-            $versionAvailable = $updater->source()->getVersionAvailable();
+        // Create a release
+        $release = $updater->source()->fetch($versionAvailable);

-            // Create a release
-            $release = $updater->source()->fetch($versionAvailable);
+        $updater->source()->update($release);

-            $updater->source()->update($release);
-
-        //}
            
        $cacheCompiled = base_path('bootstrap/cache/compiled.php');
        if (file_exists($cacheCompiled)) { unlink ($cacheCompiled); }
@ -105,7 +100,9 @@ class SelfUpdateController extends BaseController
            // nlog($file->getPathname());

            if ($file->isFile() && ! $file->isWritable()) {
-                throw new FilePermissionsFailure($file);
+                // throw new FilePermissionsFailure($file);
+                nlog("Cannot update system because {$file->getFileName()} is not writable");
+                throw new FilePermissionsFailure("Cannot update system because {$file->getFileName()} is not writable");
                return false;
            }
        }
--- a/app/Http/Controllers/SetupController.php
+++ b/app/Http/Controllers/SetupController.php
@ -284,18 +284,17 @@ class SetupController extends Controller
        if (file_exists($cacheCompiled)) {
            unlink ($cacheCompiled);
        }
+
        $cacheServices = base_path('bootstrap/cache/services.php');
        if (file_exists($cacheServices)) {
            unlink ($cacheServices);
        }

        Artisan::call('clear-compiled');
-        Artisan::call('cache:clear');
-        Artisan::call('debugbar:clear');
        Artisan::call('route:clear');
        Artisan::call('view:clear');
        Artisan::call('config:clear');
-        Cache::flush();
+
        Artisan::call('migrate', ['--force' => true]);
        Artisan::call('db:seed', ['--force' => true]);

--- a/app/Http/Middleware/QueryLogging.php
+++ b/app/Http/Middleware/QueryLogging.php
@ -55,7 +55,7 @@ class QueryLogging
            nlog($request->method().' - '.$request->url().": $count queries - ".$time);

            //  if($count > 50)
-            nlog($queries);
+            //nlog($queries);
            
           LightLogs::create(new DbQuery($request->method(), $request->url(), $count, $time, request()->ip()))
                 ->batch();
--- a/app/Http/Requests/Company/StoreCompanyRequest.php
+++ b/app/Http/Requests/Company/StoreCompanyRequest.php
@ -55,12 +55,17 @@ class StoreCompanyRequest extends Request
    {
        $input = $this->all();

+        if(array_key_exists('portal_domain', $input) && strlen($input['portal_domain']) > 1)
+            $input['portal_domain'] = str_replace("http:", "https:", $input['portal_domain']);
+
        if (array_key_exists('google_analytics_url', $input)) {
            $input['google_analytics_key'] = $input['google_analytics_url'];
        }

        $company_settings = CompanySettings::defaults();

+        //@todo this code doesn't make sense as we never return $company_settings anywhere
+        //@deprecated???
        if (array_key_exists('settings', $input) && ! empty($input['settings'])) {
            foreach ($input['settings'] as $key => $value) {
                $company_settings->{$key} = $value;
--- a/app/Http/Requests/Company/UpdateCompanyRequest.php
+++ b/app/Http/Requests/Company/UpdateCompanyRequest.php
@ -59,7 +59,10 @@ class UpdateCompanyRequest extends Request
    protected function prepareForValidation()
    {
        $input = $this->all();
-// nlog($input);
+
+        if(array_key_exists('portal_domain', $input) && strlen($input['portal_domain']) > 1)
+            $input['portal_domain'] = str_replace("http:", "https:", $input['portal_domain']);
+
        if (array_key_exists('settings', $input)) {
            $input['settings'] = $this->filterSaveableSettings($input['settings']);
        }
--- a/app/Jobs/Util/VersionCheck.php
+++ b/app/Jobs/Util/VersionCheck.php
@ -46,6 +46,9 @@ class VersionCheck implements ShouldQueue
        {
            $account = Account::first();

+            if(!$account)
+                return;
+
            if($account->plan == 'white_label' && $account->plan_expires->lt(now())){
                $account->plan = null;
                $account->plan_expires = null;
--- a/app/Listeners/Account/CreateAccountActivity.php
+++ b/app/Listeners/Account/CreateAccountActivity.php
@ -42,7 +42,7 @@ class CreateAccountActivity implements ShouldQueue
        if(Ninja::isHosted())
        {
            $nmo = new NinjaMailerObject;
-            $nmo->mailable = new Modules\Admin\Mail\Welcome($event->user);
+            $nmo->mailable = new \Modules\Admin\Mail\Welcome($event->user);
            $nmo->company =  $event->company;
            $nmo->settings = $event->company->settings;
            $nmo->to_user = $event->user;
--- a/app/Observers/CompanyObserver.php
+++ b/app/Observers/CompanyObserver.php
@ -13,6 +13,7 @@ namespace App\Observers;

 use App\Events\Company\CompanyDocumentsDeleted;
 use App\Models\Company;
+use App\Utils\Ninja;

 class CompanyObserver
 {
@ -35,7 +36,16 @@ class CompanyObserver
     */
    public function updated(Company $company)
    {
-        //
+
+        if(Ninja::isHosted() && $company->portal_mode == 'domain' && $company->isDirty('portal_domain'))
+        {
+        nlog('company observer - updated');
+        nlog($company->portal_domain);
+        nlog($company->getOriginal('portal_domain'));
+
+            //fire event to build new custom portal domain 
+            \Modules\Admin\Jobs\Domain\CustomDomain::dispatch($company->getOriginal('portal_domain'), $company)->onQueue('domain');
+        }
    }

    /**
--- a/composer.json
+++ b/composer.json
@ -93,8 +93,7 @@
            "Database\\Seeders\\": "database/seeders/",
            "Modules\\": "Modules/"
        },
-        "files": [
-        ]
+        "files": []
    },
    "autoload-dev": {
        "psr-4": {
@ -136,4 +135,4 @@
    },
    "minimum-stability": "dev",
    "prefer-stable": true
-}
+}
--- a/composer.lock
+++ b/composer.lock
@ -51,16 +51,16 @@
        },
        {
            "name": "aws/aws-sdk-php",
-            "version": "3.179.0",
+            "version": "3.179.2",
            "source": {
                "type": "git",
                "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "59b0ceab1dfafa7c606ee8b940a42dc66921d11f"
+                "reference": "7d3490e35878d0884905fa0c1ab43ecf178c8d9b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/59b0ceab1dfafa7c606ee8b940a42dc66921d11f",
-                "reference": "59b0ceab1dfafa7c606ee8b940a42dc66921d11f",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/7d3490e35878d0884905fa0c1ab43ecf178c8d9b",
+                "reference": "7d3490e35878d0884905fa0c1ab43ecf178c8d9b",
                "shasum": ""
            },
            "require": {
@ -135,9 +135,9 @@
            "support": {
                "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.179.0"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.179.2"
            },
-            "time": "2021-04-28T18:14:15+00:00"
+            "time": "2021-04-30T19:46:52+00:00"
        },
        {
            "name": "bacon/bacon-qr-code",
@ -3251,16 +3251,16 @@
        },
        {
            "name": "league/commonmark",
-            "version": "1.5.8",
+            "version": "1.6.0",
            "source": {
                "type": "git",
                "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "08fa59b8e4e34ea8a773d55139ae9ac0e0aecbaf"
+                "reference": "19a9673b833cc37770439097b381d86cd125bfe8"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/08fa59b8e4e34ea8a773d55139ae9ac0e0aecbaf",
-                "reference": "08fa59b8e4e34ea8a773d55139ae9ac0e0aecbaf",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/19a9673b833cc37770439097b381d86cd125bfe8",
+                "reference": "19a9673b833cc37770439097b381d86cd125bfe8",
                "shasum": ""
            },
            "require": {
@ -3348,7 +3348,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-03-28T18:51:39+00:00"
+            "time": "2021-05-01T19:00:49+00:00"
        },
        {
            "name": "league/csv",
@ -6863,16 +6863,16 @@
        },
        {
            "name": "sentry/sentry-laravel",
-            "version": "2.4.2",
+            "version": "2.5.1",
            "source": {
                "type": "git",
                "url": "https://github.com/getsentry/sentry-laravel.git",
-                "reference": "1bb0bcc240d25e72f3cf0321f3d6064f24dec504"
+                "reference": "2af8a531f202f0ac014f5fad532815ed34f730a9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/getsentry/sentry-laravel/zipball/1bb0bcc240d25e72f3cf0321f3d6064f24dec504",
-                "reference": "1bb0bcc240d25e72f3cf0321f3d6064f24dec504",
+                "url": "https://api.github.com/repos/getsentry/sentry-laravel/zipball/2af8a531f202f0ac014f5fad532815ed34f730a9",
+                "reference": "2af8a531f202f0ac014f5fad532815ed34f730a9",
                "shasum": ""
            },
            "require": {
@ -6935,7 +6935,7 @@
            ],
            "support": {
                "issues": "https://github.com/getsentry/sentry-laravel/issues",
-                "source": "https://github.com/getsentry/sentry-laravel/tree/2.4.2"
+                "source": "https://github.com/getsentry/sentry-laravel/tree/2.5.1"
            },
            "funding": [
                {
@ -6947,7 +6947,7 @@
                    "type": "custom"
                }
            ],
-            "time": "2021-03-24T19:36:23+00:00"
+            "time": "2021-04-29T11:10:22+00:00"
        },
        {
            "name": "stripe/stripe-php",
@ -7087,16 +7087,16 @@
        },
        {
            "name": "symfony/console",
-            "version": "v5.2.6",
+            "version": "v5.2.7",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "35f039df40a3b335ebf310f244cb242b3a83ac8d"
+                "reference": "90374b8ed059325b49a29b55b3f8bb4062c87629"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/35f039df40a3b335ebf310f244cb242b3a83ac8d",
-                "reference": "35f039df40a3b335ebf310f244cb242b3a83ac8d",
+                "url": "https://api.github.com/repos/symfony/console/zipball/90374b8ed059325b49a29b55b3f8bb4062c87629",
+                "reference": "90374b8ed059325b49a29b55b3f8bb4062c87629",
                "shasum": ""
            },
            "require": {
@ -7164,7 +7164,7 @@
                "terminal"
            ],
            "support": {
-                "source": "https://github.com/symfony/console/tree/v5.2.6"
+                "source": "https://github.com/symfony/console/tree/v5.2.7"
            },
            "funding": [
                {
@ -7180,20 +7180,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-03-28T09:42:18+00:00"
+            "time": "2021-04-19T14:07:32+00:00"
        },
        {
            "name": "symfony/css-selector",
-            "version": "v5.2.4",
+            "version": "v5.2.7",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/css-selector.git",
-                "reference": "f65f217b3314504a1ec99c2d6ef69016bb13490f"
+                "reference": "59a684f5ac454f066ecbe6daecce6719aed283fb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/f65f217b3314504a1ec99c2d6ef69016bb13490f",
-                "reference": "f65f217b3314504a1ec99c2d6ef69016bb13490f",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/59a684f5ac454f066ecbe6daecce6719aed283fb",
+                "reference": "59a684f5ac454f066ecbe6daecce6719aed283fb",
                "shasum": ""
            },
            "require": {
@ -7229,7 +7229,7 @@
            "description": "Converts CSS selectors to XPath expressions",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v5.2.4"
+                "source": "https://github.com/symfony/css-selector/tree/v5.3.0-BETA1"
            },
            "funding": [
                {
@ -7245,7 +7245,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-01-27T10:01:46+00:00"
+            "time": "2021-04-07T16:07:52+00:00"
        },
        {
            "name": "symfony/deprecation-contracts",
@ -7316,16 +7316,16 @@
        },
        {
            "name": "symfony/error-handler",
-            "version": "v5.2.6",
+            "version": "v5.2.7",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/error-handler.git",
-                "reference": "bdb7fb4188da7f4211e4b88350ba0dfdad002b03"
+                "reference": "ea3ddbf67615e883ca7c33a4de61213789846782"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/bdb7fb4188da7f4211e4b88350ba0dfdad002b03",
-                "reference": "bdb7fb4188da7f4211e4b88350ba0dfdad002b03",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/ea3ddbf67615e883ca7c33a4de61213789846782",
+                "reference": "ea3ddbf67615e883ca7c33a4de61213789846782",
                "shasum": ""
            },
            "require": {
@ -7365,7 +7365,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.6"
+                "source": "https://github.com/symfony/error-handler/tree/v5.2.7"
            },
            "funding": [
                {
@ -7381,7 +7381,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-03-16T09:07:47+00:00"
+            "time": "2021-04-07T15:57:33+00:00"
        },
        {
            "name": "symfony/event-dispatcher",
@ -7549,16 +7549,16 @@
        },
        {
            "name": "symfony/filesystem",
-            "version": "v5.2.6",
+            "version": "v5.2.7",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/filesystem.git",
-                "reference": "8c86a82f51658188119e62cff0a050a12d09836f"
+                "reference": "056e92acc21d977c37e6ea8e97374b2a6c8551b0"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/8c86a82f51658188119e62cff0a050a12d09836f",
-                "reference": "8c86a82f51658188119e62cff0a050a12d09836f",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/056e92acc21d977c37e6ea8e97374b2a6c8551b0",
+                "reference": "056e92acc21d977c37e6ea8e97374b2a6c8551b0",
                "shasum": ""
            },
            "require": {
@ -7591,7 +7591,7 @@
            "description": "Provides basic utilities for the filesystem",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v5.2.6"
+                "source": "https://github.com/symfony/filesystem/tree/v5.2.7"
            },
            "funding": [
                {
@ -7607,7 +7607,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-03-28T14:30:26+00:00"
+            "time": "2021-04-01T10:42:13+00:00"
        },
        {
            "name": "symfony/finder",
@ -7672,16 +7672,16 @@
        },
        {
            "name": "symfony/http-client",
-            "version": "v5.2.6",
+            "version": "v5.2.7",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-client.git",
-                "reference": "3c3075467da15bc2edf38d2ac20d34719e794bd8"
+                "reference": "cdaf3df771d3ea9b05696c9e91281ffd056aff66"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client/zipball/3c3075467da15bc2edf38d2ac20d34719e794bd8",
-                "reference": "3c3075467da15bc2edf38d2ac20d34719e794bd8",
+                "url": "https://api.github.com/repos/symfony/http-client/zipball/cdaf3df771d3ea9b05696c9e91281ffd056aff66",
+                "reference": "cdaf3df771d3ea9b05696c9e91281ffd056aff66",
                "shasum": ""
            },
            "require": {
@ -7738,7 +7738,7 @@
            "description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/http-client/tree/v5.2.6"
+                "source": "https://github.com/symfony/http-client/tree/v5.2.7"
            },
            "funding": [
                {
@ -7754,7 +7754,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-03-28T09:42:18+00:00"
+            "time": "2021-04-07T16:27:53+00:00"
        },
        {
            "name": "symfony/http-client-contracts",
@ -7836,16 +7836,16 @@
        },
        {
            "name": "symfony/http-foundation",
-            "version": "v5.2.4",
+            "version": "v5.2.7",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "54499baea7f7418bce7b5ec92770fd0799e8e9bf"
+                "reference": "a416487a73bb9c9d120e9ba3a60547f4a3fb7a1f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/54499baea7f7418bce7b5ec92770fd0799e8e9bf",
-                "reference": "54499baea7f7418bce7b5ec92770fd0799e8e9bf",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/a416487a73bb9c9d120e9ba3a60547f4a3fb7a1f",
+                "reference": "a416487a73bb9c9d120e9ba3a60547f4a3fb7a1f",
                "shasum": ""
            },
            "require": {
@ -7889,7 +7889,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.4"
+                "source": "https://github.com/symfony/http-foundation/tree/v5.2.7"
            },
            "funding": [
                {
@ -7905,20 +7905,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-02-25T17:16:57+00:00"
+            "time": "2021-05-01T13:46:24+00:00"
        },
        {
            "name": "symfony/http-kernel",
-            "version": "v5.2.6",
+            "version": "v5.2.7",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "f34de4c61ca46df73857f7f36b9a3805bdd7e3b2"
+                "reference": "1e9f6879f070f718e0055fbac232a56f67b8b6bd"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f34de4c61ca46df73857f7f36b9a3805bdd7e3b2",
-                "reference": "f34de4c61ca46df73857f7f36b9a3805bdd7e3b2",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/1e9f6879f070f718e0055fbac232a56f67b8b6bd",
+                "reference": "1e9f6879f070f718e0055fbac232a56f67b8b6bd",
                "shasum": ""
            },
            "require": {
@ -8001,7 +8001,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.6"
+                "source": "https://github.com/symfony/http-kernel/tree/v5.2.7"
            },
            "funding": [
                {
@ -8017,20 +8017,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-03-29T05:16:58+00:00"
+            "time": "2021-05-01T14:53:15+00:00"
        },
        {
            "name": "symfony/mime",
-            "version": "v5.2.6",
+            "version": "v5.2.7",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/mime.git",
-                "reference": "1b2092244374cbe48ae733673f2ca0818b37197b"
+                "reference": "7af452bf51c46f18da00feb32e1ad36db9426515"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/1b2092244374cbe48ae733673f2ca0818b37197b",
-                "reference": "1b2092244374cbe48ae733673f2ca0818b37197b",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/7af452bf51c46f18da00feb32e1ad36db9426515",
+                "reference": "7af452bf51c46f18da00feb32e1ad36db9426515",
                "shasum": ""
            },
            "require": {
@ -8084,7 +8084,7 @@
                "mime-type"
            ],
            "support": {
-                "source": "https://github.com/symfony/mime/tree/v5.2.6"
+                "source": "https://github.com/symfony/mime/tree/v5.2.7"
            },
            "funding": [
                {
@ -8100,7 +8100,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-03-12T13:18:39+00:00"
+            "time": "2021-04-29T20:47:09+00:00"
        },
        {
            "name": "symfony/options-resolver",
@ -8981,16 +8981,16 @@
        },
        {
            "name": "symfony/process",
-            "version": "v5.2.4",
+            "version": "v5.2.7",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/process.git",
-                "reference": "313a38f09c77fbcdc1d223e57d368cea76a2fd2f"
+                "reference": "98cb8eeb72e55d4196dd1e36f1f16e7b3a9a088e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/313a38f09c77fbcdc1d223e57d368cea76a2fd2f",
-                "reference": "313a38f09c77fbcdc1d223e57d368cea76a2fd2f",
+                "url": "https://api.github.com/repos/symfony/process/zipball/98cb8eeb72e55d4196dd1e36f1f16e7b3a9a088e",
+                "reference": "98cb8eeb72e55d4196dd1e36f1f16e7b3a9a088e",
                "shasum": ""
            },
            "require": {
@ -9023,7 +9023,7 @@
            "description": "Executes commands in sub-processes",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/process/tree/v5.2.4"
+                "source": "https://github.com/symfony/process/tree/v5.3.0-BETA1"
            },
            "funding": [
                {
@ -9039,7 +9039,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-01-27T10:15:41+00:00"
+            "time": "2021-04-08T10:27:02+00:00"
        },
        {
            "name": "symfony/psr-http-message-bridge",
@ -9131,16 +9131,16 @@
        },
        {
            "name": "symfony/routing",
-            "version": "v5.2.6",
+            "version": "v5.2.7",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/routing.git",
-                "reference": "31fba555f178afd04d54fd26953501b2c3f0c6e6"
+                "reference": "3f0cab2e95b5e92226f34c2c1aa969d3fc41f48c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/31fba555f178afd04d54fd26953501b2c3f0c6e6",
-                "reference": "31fba555f178afd04d54fd26953501b2c3f0c6e6",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/3f0cab2e95b5e92226f34c2c1aa969d3fc41f48c",
+                "reference": "3f0cab2e95b5e92226f34c2c1aa969d3fc41f48c",
                "shasum": ""
            },
            "require": {
@ -9163,7 +9163,6 @@
                "symfony/yaml": "^4.4|^5.0"
            },
            "suggest": {
-                "doctrine/annotations": "For using the annotation loader",
                "symfony/config": "For using the all-in-one router or any loader",
                "symfony/expression-language": "For using expression matching",
                "symfony/http-foundation": "For using a Symfony Request object",
@ -9201,7 +9200,7 @@
                "url"
            ],
            "support": {
-                "source": "https://github.com/symfony/routing/tree/v5.2.6"
+                "source": "https://github.com/symfony/routing/tree/v5.2.7"
            },
            "funding": [
                {
@ -9217,7 +9216,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-03-14T13:53:33+00:00"
+            "time": "2021-04-11T22:55:21+00:00"
        },
        {
            "name": "symfony/service-contracts",
@ -9383,16 +9382,16 @@
        },
        {
            "name": "symfony/translation",
-            "version": "v5.2.6",
+            "version": "v5.2.7",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/translation.git",
-                "reference": "2cc7f45d96db9adfcf89adf4401d9dfed509f4e1"
+                "reference": "e37ece5242564bceea54d709eafc948377ec9749"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/2cc7f45d96db9adfcf89adf4401d9dfed509f4e1",
-                "reference": "2cc7f45d96db9adfcf89adf4401d9dfed509f4e1",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/e37ece5242564bceea54d709eafc948377ec9749",
+                "reference": "e37ece5242564bceea54d709eafc948377ec9749",
                "shasum": ""
            },
            "require": {
@ -9456,7 +9455,7 @@
            "description": "Provides tools to internationalize your application",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/translation/tree/v5.2.6"
+                "source": "https://github.com/symfony/translation/tree/v5.2.7"
            },
            "funding": [
                {
@ -9472,7 +9471,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-03-23T19:33:48+00:00"
+            "time": "2021-04-01T08:15:21+00:00"
        },
        {
            "name": "symfony/translation-contracts",
@ -9554,16 +9553,16 @@
        },
        {
            "name": "symfony/var-dumper",
-            "version": "v5.2.6",
+            "version": "v5.2.7",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "89412a68ea2e675b4e44f260a5666729f77f668e"
+                "reference": "27cb9f7cfa3853c736425c7233a8f68814b19636"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/89412a68ea2e675b4e44f260a5666729f77f668e",
-                "reference": "89412a68ea2e675b4e44f260a5666729f77f668e",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/27cb9f7cfa3853c736425c7233a8f68814b19636",
+                "reference": "27cb9f7cfa3853c736425c7233a8f68814b19636",
                "shasum": ""
            },
            "require": {
@ -9622,7 +9621,7 @@
                "dump"
            ],
            "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v5.2.6"
+                "source": "https://github.com/symfony/var-dumper/tree/v5.2.7"
            },
            "funding": [
                {
@ -9638,7 +9637,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-03-28T09:42:18+00:00"
+            "time": "2021-04-19T14:07:32+00:00"
        },
        {
            "name": "tijsverkoyen/css-to-inline-styles",
@ -10945,16 +10944,16 @@
        },
        {
            "name": "facade/flare-client-php",
-            "version": "1.7.0",
+            "version": "1.8.0",
            "source": {
                "type": "git",
                "url": "https://github.com/facade/flare-client-php.git",
-                "reference": "6bf380035890cb0a09b9628c491ae3866b858522"
+                "reference": "69742118c037f34ee1ef86dc605be4a105d9e984"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/facade/flare-client-php/zipball/6bf380035890cb0a09b9628c491ae3866b858522",
-                "reference": "6bf380035890cb0a09b9628c491ae3866b858522",
+                "url": "https://api.github.com/repos/facade/flare-client-php/zipball/69742118c037f34ee1ef86dc605be4a105d9e984",
+                "reference": "69742118c037f34ee1ef86dc605be4a105d9e984",
                "shasum": ""
            },
            "require": {
@ -10998,7 +10997,7 @@
            ],
            "support": {
                "issues": "https://github.com/facade/flare-client-php/issues",
-                "source": "https://github.com/facade/flare-client-php/tree/1.7.0"
+                "source": "https://github.com/facade/flare-client-php/tree/1.8.0"
            },
            "funding": [
                {
@ -11006,20 +11005,20 @@
                    "type": "github"
                }
            ],
-            "time": "2021-04-12T09:30:36+00:00"
+            "time": "2021-04-30T11:11:50+00:00"
        },
        {
            "name": "facade/ignition",
-            "version": "2.8.3",
+            "version": "2.8.4",
            "source": {
                "type": "git",
                "url": "https://github.com/facade/ignition.git",
-                "reference": "a8201d51aae83addceaef9344592a3b068b5d64d"
+                "reference": "87fb348dab0ae1a7c206c3e902a5a44ba541742f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/facade/ignition/zipball/a8201d51aae83addceaef9344592a3b068b5d64d",
-                "reference": "a8201d51aae83addceaef9344592a3b068b5d64d",
+                "url": "https://api.github.com/repos/facade/ignition/zipball/87fb348dab0ae1a7c206c3e902a5a44ba541742f",
+                "reference": "87fb348dab0ae1a7c206c3e902a5a44ba541742f",
                "shasum": ""
            },
            "require": {
@ -11083,7 +11082,7 @@
                "issues": "https://github.com/facade/ignition/issues",
                "source": "https://github.com/facade/ignition"
            },
-            "time": "2021-04-09T20:45:59+00:00"
+            "time": "2021-04-29T13:55:26+00:00"
        },
        {
            "name": "facade/ignition-contracts",
@ -13630,16 +13629,16 @@
        },
        {
            "name": "swagger-api/swagger-ui",
-            "version": "v3.47.1",
+            "version": "v3.48.0",
            "source": {
                "type": "git",
                "url": "https://github.com/swagger-api/swagger-ui.git",
-                "reference": "0f8548c0d443fa37f10a45948d5f2babf685c657"
+                "reference": "f96bc134a31c1250218df912f1e145fbb32191b0"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/swagger-api/swagger-ui/zipball/0f8548c0d443fa37f10a45948d5f2babf685c657",
-                "reference": "0f8548c0d443fa37f10a45948d5f2babf685c657",
+                "url": "https://api.github.com/repos/swagger-api/swagger-ui/zipball/f96bc134a31c1250218df912f1e145fbb32191b0",
+                "reference": "f96bc134a31c1250218df912f1e145fbb32191b0",
                "shasum": ""
            },
            "type": "library",
@ -13685,22 +13684,22 @@
            ],
            "support": {
                "issues": "https://github.com/swagger-api/swagger-ui/issues",
-                "source": "https://github.com/swagger-api/swagger-ui/tree/v3.47.1"
+                "source": "https://github.com/swagger-api/swagger-ui/tree/v3.48.0"
            },
-            "time": "2021-04-15T21:56:21+00:00"
+            "time": "2021-04-29T22:10:35+00:00"
        },
        {
            "name": "symfony/debug",
-            "version": "v4.4.20",
+            "version": "v4.4.22",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/debug.git",
-                "reference": "157bbec4fd773bae53c5483c50951a5530a2cc16"
+                "reference": "45b2136377cca5f10af858968d6079a482bca473"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/157bbec4fd773bae53c5483c50951a5530a2cc16",
-                "reference": "157bbec4fd773bae53c5483c50951a5530a2cc16",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/45b2136377cca5f10af858968d6079a482bca473",
+                "reference": "45b2136377cca5f10af858968d6079a482bca473",
                "shasum": ""
            },
            "require": {
@ -13740,7 +13739,7 @@
            "description": "Provides tools to ease debugging PHP code",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/debug/tree/v4.4.20"
+                "source": "https://github.com/symfony/debug/tree/v4.4.22"
            },
            "funding": [
                {
@ -13756,7 +13755,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-01-28T16:54:48+00:00"
+            "time": "2021-04-02T07:50:12+00:00"
        },
        {
            "name": "symfony/polyfill-php70",
@ -13828,16 +13827,16 @@
        },
        {
            "name": "symfony/stopwatch",
-            "version": "v5.2.4",
+            "version": "v5.2.7",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "b12274acfab9d9850c52583d136a24398cdf1a0c"
+                "reference": "d99310c33e833def36419c284f60e8027d359678"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/b12274acfab9d9850c52583d136a24398cdf1a0c",
-                "reference": "b12274acfab9d9850c52583d136a24398cdf1a0c",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/d99310c33e833def36419c284f60e8027d359678",
+                "reference": "d99310c33e833def36419c284f60e8027d359678",
                "shasum": ""
            },
            "require": {
@ -13870,7 +13869,7 @@
            "description": "Provides a way to profile code",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/stopwatch/tree/v5.2.4"
+                "source": "https://github.com/symfony/stopwatch/tree/v5.3.0-BETA1"
            },
            "funding": [
                {
@ -13886,20 +13885,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-01-27T10:15:41+00:00"
+            "time": "2021-03-29T15:28:41+00:00"
        },
        {
            "name": "symfony/yaml",
-            "version": "v5.2.5",
+            "version": "v5.2.7",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/yaml.git",
-                "reference": "298a08ddda623485208506fcee08817807a251dd"
+                "reference": "76546cbeddd0a9540b4e4e57eddeec3e9bb444a5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/298a08ddda623485208506fcee08817807a251dd",
-                "reference": "298a08ddda623485208506fcee08817807a251dd",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/76546cbeddd0a9540b4e4e57eddeec3e9bb444a5",
+                "reference": "76546cbeddd0a9540b4e4e57eddeec3e9bb444a5",
                "shasum": ""
            },
            "require": {
@ -13945,7 +13944,7 @@
            "description": "Loads and dumps YAML files",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/yaml/tree/v5.2.5"
+                "source": "https://github.com/symfony/yaml/tree/v5.2.7"
            },
            "funding": [
                {
@ -13961,7 +13960,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-03-06T07:59:01+00:00"
+            "time": "2021-04-29T20:47:09+00:00"
        },
        {
            "name": "theseer/tokenizer",
@ -14015,16 +14014,16 @@
        },
        {
            "name": "vimeo/psalm",
-            "version": "4.7.1",
+            "version": "4.7.2",
            "source": {
                "type": "git",
                "url": "https://github.com/vimeo/psalm.git",
-                "reference": "cd53e047a58f71f646dd6bf45476076ab07b5d44"
+                "reference": "83a0325c0a95c0ab531d6b90c877068b464377b5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/vimeo/psalm/zipball/cd53e047a58f71f646dd6bf45476076ab07b5d44",
-                "reference": "cd53e047a58f71f646dd6bf45476076ab07b5d44",
+                "url": "https://api.github.com/repos/vimeo/psalm/zipball/83a0325c0a95c0ab531d6b90c877068b464377b5",
+                "reference": "83a0325c0a95c0ab531d6b90c877068b464377b5",
                "shasum": ""
            },
            "require": {
@ -14114,9 +14113,9 @@
            ],
            "support": {
                "issues": "https://github.com/vimeo/psalm/issues",
-                "source": "https://github.com/vimeo/psalm/tree/4.7.1"
+                "source": "https://github.com/vimeo/psalm/tree/4.7.2"
            },
-            "time": "2021-04-25T21:26:25+00:00"
+            "time": "2021-05-01T20:56:25+00:00"
        },
        {
            "name": "webmozart/path-util",
--- a/config/ninja.php
+++ b/config/ninja.php
@ -14,8 +14,8 @@ return [
    'require_https' => env('REQUIRE_HTTPS', true),
    'app_url' => rtrim(env('APP_URL', ''), '/'),
    'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => '5.1.57',
-    'app_tag' => '5.1.57-release',
+    'app_version' => '5.1.58',
+    'app_tag' => '5.1.58-release',
    'minimum_client_version' => '5.0.16',
    'terms_version' => '1.0.1',
    'api_secret' => env('API_SECRET', false),
--- a/public/flutter_service_worker.js
+++ b/public/flutter_service_worker.js
@ -9,7 +9,7 @@ const RESOURCES = {
 "icons/Icon-192.png": "bb1cf5f6982006952211c7c8404ffbed",
 "icons/Icon-512.png": "0f9aff01367f0a0c69773d25ca16ef35",
 "manifest.json": "ce1b79950eb917ea619a0a30da27c6a3",
-"main.dart.js": "ca5bc685260a6de6833924b3bf0b6d9b",
+"main.dart.js": "6050162ccfbc10d053ef43789a0d504e",
 "assets/NOTICES": "dcba058006722202a4906fb433998480",
 "assets/fonts/MaterialIcons-Regular.otf": "1288c9e28052e028aba623321f7826ac",
 "assets/AssetManifest.json": "659dcf9d1baf3aed3ab1b9c42112bf8f",
--- a/public/main.dart.js
+++ b/public/main.dart.js
--- a/public/main.dart.js.map
+++ b/public/main.dart.js.map
--- a/public/main.foss.dart.js
+++ b/public/main.foss.dart.js
 @ -1 +1 @@
 .1.57
 .1.58