Merge branch 'master' of github.com:akaunting/akaunting

This commit is contained in:
Cüneyt Şentürk 2021-05-12 19:17:41 +03:00
commit 898b18253d
3 changed files with 4 additions and 3 deletions

View File

@ -41,8 +41,8 @@ class DeleteCompany extends Job
\DB::transaction(function () {
$this->deleteRelationships($this->company, [
'accounts', 'documents', 'document_histories', 'document_items', 'document_item_taxes', 'document_totals', 'categories',
'contacts', 'currencies', 'dashboards', 'email_templates', 'items', 'modules', 'module_histories', 'reconciliations',
'accounts', 'document_histories', 'document_item_taxes', 'document_items', 'document_totals', 'documents', 'categories',
'contacts', 'currencies', 'dashboards', 'email_templates', 'items', 'module_histories', 'modules', 'reconciliations',
'recurring', 'reports', 'settings', 'taxes', 'transactions', 'transfers', 'widgets',
]);

View File

@ -36,7 +36,7 @@ class Version2112 extends Listener
public function updateCompanies()
{
$companies = Company::cursor();
$companies = Company::withTrashed()->cursor();
foreach ($companies as $company) {
$this->moveMedia($company);

View File

@ -81,6 +81,7 @@ return [
's3' => [
'driver' => 's3',
'root' => env('AWS_ROOT'),
'key' => env('AWS_ACCESS_KEY_ID'),
'secret' => env('AWS_SECRET_ACCESS_KEY'),
'region' => env('AWS_DEFAULT_REGION'),