Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-01 05:24:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
David Bomba 2021-10-01 08:55:35 +10:00
parent 5f6fa2371a
commit b28d76d491
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/CompanyController.php
View File

@ -500,7 +500,7 @@ class CompanyController extends BaseController
$account->delete(); $account->delete();
if(Ninja::isHosted()) if(Ninja::isHosted())
\Modules\Admin\Jobs\Account\NinjaDeletedAccount::dispatch($account_key); \Modules\Admin\Jobs\Account\NinjaDeletedAccount::dispatch($account_key, $request->all());
LightLogs::create(new AccountDeleted()) LightLogs::create(new AccountDeleted())
->increment() ->increment()

1
app/Http/Controllers/SubdomainController.php
View File

@ -30,6 +30,7 @@ class SubdomainController extends BaseController
'invoiceninja', 'invoiceninja',
'cname', 'cname',
'sandbox', 'sandbox',
'stage',
]; ];
public function __construct() public function __construct()

2
app/Models/Account.php
View File

@ -407,7 +407,7 @@ class Account extends BaseModel
} }
} }
catch(\Exception $e){ catch(\Exception $e){
\Sentry\captureMessage("I encountered an error with email quotas - defaulting to SEND"); \Sentry\captureMessage("I encountered an error with email quotas for account {$this->key} - defaulting to SEND");
} }
return false; return false;

4
app/Services/Quote/TriggeredActions.php
View File

@ -45,6 +45,10 @@ class TriggeredActions extends AbstractService
$this->quote = $this->quote->service()->markSent()->save(); $this->quote = $this->quote->service()->markSent()->save();
} }
if ($this->request->has('convert') && $this->request->input('convert') == 'true') {
$this->quote = $this->quote->service()->convert()->save();
}
return $this->quote; return $this->quote;
} }