Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop

Browse Source
This commit is contained in:
David Bomba 2021-06-26 10:32:45 +10:00
commit fc37757f21
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/Console/Commands/SubdomainFill.php
View File

@ -60,36 +60,36 @@ class SubdomainFill extends Command
});
$db1 = Company::on('db-ninja-01')->get();
// $db1 = Company::on('db-ninja-01')->get();
$db1->each(function ($company){
// $db1->each(function ($company){
$db2 = Company::on('db-ninja-02a')->find($company->id);
// $db2 = Company::on('db-ninja-02a')->find($company->id);
if($db2)
{
$db2->subdomain = $company->subdomain;
$db2->save();
}
// if($db2)
// {
// $db2->subdomain = $company->subdomain;
// $db2->save();
// }
});
// });
$db1 = null;
$db2 = null;
// $db1 = null;
// $db2 = null;
$db2 = Company::on('db-ninja-02')->get();
// $db2 = Company::on('db-ninja-02')->get();
$db2->each(function ($company){
// $db2->each(function ($company){
$db1 = Company::on('db-ninja-01a')->find($company->id);
// $db1 = Company::on('db-ninja-01a')->find($company->id);
if($db1)
{
$db1->subdomain = $company->subdomain;
$db1->save();
}
});
// if($db1)
// {
// $db1->subdomain = $company->subdomain;
// $db1->save();
// }
// });
}
}

4
app/Jobs/Util/Import.php
View File

@ -337,6 +337,10 @@ class Import implements ShouldQueue
if(!MultiDB::checkDomainAvailable($data['subdomain']))
$data['subdomain'] = MultiDB::randomSubdomainGenerator();
if(strlen($data['subdomain']) == 0)
$data['subdomain'] = MultiDB::randomSubdomainGenerator();
}
$rules = (new UpdateCompanyRequest())->rules();