mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-11-10 13:12:50 +01:00
Minor fixes
This commit is contained in:
parent
5f6fa2371a
commit
b28d76d491
@ -500,7 +500,7 @@ class CompanyController extends BaseController
|
||||
$account->delete();
|
||||
|
||||
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())
|
||||
->increment()
|
||||
|
@ -30,6 +30,7 @@ class SubdomainController extends BaseController
|
||||
'invoiceninja',
|
||||
'cname',
|
||||
'sandbox',
|
||||
'stage',
|
||||
];
|
||||
|
||||
public function __construct()
|
||||
|
@ -407,7 +407,7 @@ class Account extends BaseModel
|
||||
}
|
||||
}
|
||||
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;
|
||||
|
@ -45,6 +45,10 @@ class TriggeredActions extends AbstractService
|
||||
$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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user