mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-06-11 21:54:37 -04:00
Merge pull request #6234 from turbo124/v5-develop
Fixes for subdomain fill
This commit is contained in:
commit
8485bddfee
@ -336,7 +336,7 @@ class Import implements ShouldQueue
|
|||||||
|
|
||||||
$data = $this->transformCompanyData($data);
|
$data = $this->transformCompanyData($data);
|
||||||
|
|
||||||
if(Ninja::isHosted() && strlen($data['subdomain']) > 1) {
|
if(Ninja::isHosted()) {
|
||||||
|
|
||||||
if(!MultiDB::checkDomainAvailable($data['subdomain']))
|
if(!MultiDB::checkDomainAvailable($data['subdomain']))
|
||||||
$data['subdomain'] = MultiDB::randomSubdomainGenerator();
|
$data['subdomain'] = MultiDB::randomSubdomainGenerator();
|
||||||
|
@ -125,9 +125,9 @@ class TaskStatusApiTest extends TestCase
|
|||||||
|
|
||||||
public function testTaskStatusDeletedFromDELETEROute()
|
public function testTaskStatusDeletedFromDELETEROute()
|
||||||
{
|
{
|
||||||
$data = [
|
// $data = [
|
||||||
'ids' => [$this->encodePrimaryKey($this->task_status->id)],
|
// 'ids' => [$this->encodePrimaryKey($this->task_status->id)],
|
||||||
];
|
// ];
|
||||||
|
|
||||||
$response = $this->withHeaders([
|
$response = $this->withHeaders([
|
||||||
'X-API-SECRET' => config('ninja.api_secret'),
|
'X-API-SECRET' => config('ninja.api_secret'),
|
||||||
@ -135,7 +135,8 @@ class TaskStatusApiTest extends TestCase
|
|||||||
])->delete('/api/v1/task_statuses/'.$this->encodePrimaryKey($this->task_status->id));
|
])->delete('/api/v1/task_statuses/'.$this->encodePrimaryKey($this->task_status->id));
|
||||||
|
|
||||||
$arr = $response->json();
|
$arr = $response->json();
|
||||||
nlog($arr);
|
// nlog($arr);
|
||||||
|
|
||||||
$this->assertTrue($arr['data']['is_deleted']);
|
$this->assertTrue($arr['data']['is_deleted']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user