Merge branch 'master' of github.com:akaunting/akaunting
This commit is contained in:
commit
898b18253d
@ -41,8 +41,8 @@ class DeleteCompany extends Job
|
|||||||
|
|
||||||
\DB::transaction(function () {
|
\DB::transaction(function () {
|
||||||
$this->deleteRelationships($this->company, [
|
$this->deleteRelationships($this->company, [
|
||||||
'accounts', 'documents', 'document_histories', 'document_items', 'document_item_taxes', 'document_totals', 'categories',
|
'accounts', 'document_histories', 'document_item_taxes', 'document_items', 'document_totals', 'documents', 'categories',
|
||||||
'contacts', 'currencies', 'dashboards', 'email_templates', 'items', 'modules', 'module_histories', 'reconciliations',
|
'contacts', 'currencies', 'dashboards', 'email_templates', 'items', 'module_histories', 'modules', 'reconciliations',
|
||||||
'recurring', 'reports', 'settings', 'taxes', 'transactions', 'transfers', 'widgets',
|
'recurring', 'reports', 'settings', 'taxes', 'transactions', 'transfers', 'widgets',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
@ -36,7 +36,7 @@ class Version2112 extends Listener
|
|||||||
|
|
||||||
public function updateCompanies()
|
public function updateCompanies()
|
||||||
{
|
{
|
||||||
$companies = Company::cursor();
|
$companies = Company::withTrashed()->cursor();
|
||||||
|
|
||||||
foreach ($companies as $company) {
|
foreach ($companies as $company) {
|
||||||
$this->moveMedia($company);
|
$this->moveMedia($company);
|
||||||
|
@ -81,6 +81,7 @@ return [
|
|||||||
|
|
||||||
's3' => [
|
's3' => [
|
||||||
'driver' => 's3',
|
'driver' => 's3',
|
||||||
|
'root' => env('AWS_ROOT'),
|
||||||
'key' => env('AWS_ACCESS_KEY_ID'),
|
'key' => env('AWS_ACCESS_KEY_ID'),
|
||||||
'secret' => env('AWS_SECRET_ACCESS_KEY'),
|
'secret' => env('AWS_SECRET_ACCESS_KEY'),
|
||||||
'region' => env('AWS_DEFAULT_REGION'),
|
'region' => env('AWS_DEFAULT_REGION'),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user