Merge branch 'master' into laravel6

SECURITY.md

@@ -0,0 +1,3 @@
+## Reporting a Vulnerability
+
+If you discover any security related issues, please email contact@invoiceninja.com instead of using the issue tracker.

app/Models/Account.php

@@ -1129,6 +1129,7 @@ class Account extends Eloquent
         $currencyId = ($client && $client->currency_id) ? $client->currency_id : ($this->currency_id ?: DEFAULT_CURRENCY);
 
         // $currencyId = ($client && $client->currency_id) ? $client->currency_id : $this->currency_id ?: DEFAULT_CURRENCY;
+
         $locale = ($client && $client->language_id) ? $client->language->locale : ($this->language_id ? $this->Language->locale : DEFAULT_LOCALE);
 
         Session::put(SESSION_CURRENCY, $currencyId);

app/Models/Traits/Inviteable.php

@@ -77,6 +77,7 @@ trait Inviteable
         return $hasValue ? implode('<br/>', $parts) : false;
 
         // return $hasValue ? implode($parts, '<br/>') : false;
+
     }
 
     /**

app/Ninja/Reports/InvoiceReport.php

@@ -47,6 +47,10 @@ class InvoiceReport extends AbstractReport
 
     public function run()
     {
+        if (!Auth::user()) {
+            return;
+        }
+
         $account = Auth::user()->account;
         $statusIds = $this->options['status_ids'];
         $exportFormat = $this->options['export_format'];

composer.json

@@ -66,6 +66,38 @@
         "league/flysystem-aws-s3-v3": "~1.0",
         "league/flysystem-rackspace": "~1.0",
         "league/fractal": "0.13.*",
+        "maatwebsite/excel": "~2.0",
+        "mashape/unirest-php": "^3.0.5",
+        "mpdf/mpdf": "^8.0",
+        "nesbot/carbon": "^1.26",
+        "nwidart/laravel-modules": "2.0.*",
+        "omnipay/authorizenet": "dev-solution-id as 2.5.0",
+        "omnipay/firstdata": "^2.4",
+        "patricktalmadge/bootstrapper": "5.5.x",
+        "turbo124/google2fa-laravel": "0.1.2",
+        "predis/predis": "^1.1",
+        "simshaun/recurr": "dev-master",
+        "stripe/stripe-php": "^6.40",
+        "symfony/css-selector": "~3.1",
+        "turbo124/laravel-push-notification": "2.*",
+        "webpatser/laravel-countries": "dev-master#75992ad",
+        "websight/l5-google-cloud-storage": "dev-master",
+        "wepay/php-sdk": "^0.2",
+        "wildbit/postmark-php": "^2.5",
+        "abdala/omnipay-pagseguro": "0.2",
+        "agmscode/omnipay-agms": "~1.0",
+        "andreas22/omnipay-fasapay": "1.*",
+        "bramdevries/omnipay-paymill": "^1.0",
+        "cardgate/omnipay-cardgate": "~2.0",
+        "delatbabel/omnipay-fatzebra": "dev-master",
+        "dercoder/omnipay-ecopayz": "~1.0",
+        "dercoder/omnipay-paysafecard": "dev-master",
+        "digitickets/omnipay-barclays-epdq": "~3.0",
+        "digitickets/omnipay-datacash": "~3.0",
+        "digitickets/omnipay-realex": "~5.0",
+        "fotografde/omnipay-checkoutcom": "~2.0",
+        "fruitcakestudio/omnipay-sisow": "~2.0",
+        "justinbusschau/omnipay-secpay": "~2.0",
         "lokielse/omnipay-alipay": "~1.4",
         "maatwebsite/excel": "dev-carbon#8b17952",
         "meebio/omnipay-creditcall": "dev-master",