Merge branch 'trunk'
This commit is contained in:
commit
6e12256a33
5 changed files with 5 additions and 6 deletions
|
|
@ -32,6 +32,9 @@ class ClaimController extends Controller
|
|||
);
|
||||
}
|
||||
|
||||
// Add brand id from service.
|
||||
$claimModel->brand_id = $service->brand->getKey();
|
||||
|
||||
// Add customer relation if exist.
|
||||
$crmCustomer = CustomerInfo::getFromEmail($claimModel->brand, $claimModel->email)->first();
|
||||
if (!is_null($crmCustomer)) {
|
||||
|
|
|
|||
|
|
@ -80,7 +80,6 @@ class SendClaimRequest extends BaseApiRequest
|
|||
}
|
||||
],
|
||||
'message' => 'required|string|min:3',
|
||||
'brand_id' => 'required|integer|exists:brands,id',
|
||||
'subject_id' => 'required|integer|exists:claim_subjects,id',
|
||||
];
|
||||
}
|
||||
|
|
|
|||
2
client
2
client
|
|
@ -1 +1 @@
|
|||
Subproject commit f09825531bb86c5df3b4a443620534eeda3578b4
|
||||
Subproject commit 59c94e16e57e17d33f05099f3f29d93d88324771
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "ldc/ldccrm",
|
||||
"version": "4.1.8",
|
||||
"version": "4.1.9",
|
||||
"type": "project",
|
||||
"description": "LDC CRM",
|
||||
"license": "MIT",
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@ class CrmClientClaimTest extends CrmClientTester
|
|||
'claim@hotmail.fr',
|
||||
'Ceci est un message.',
|
||||
1,
|
||||
1,
|
||||
'10 rue des totos',
|
||||
'Le Mans',
|
||||
'72100',
|
||||
|
|
@ -55,7 +54,6 @@ class CrmClientClaimTest extends CrmClientTester
|
|||
'claim@hotmail.fr',
|
||||
'Ceci est un message.',
|
||||
1,
|
||||
1,
|
||||
));
|
||||
$this->assertTrue(ModelsClaim::query()->where('email', 'claim@hotmail.fr')->exists());
|
||||
}
|
||||
|
|
@ -74,7 +72,6 @@ class CrmClientClaimTest extends CrmClientTester
|
|||
'claim@hotmail.fr',
|
||||
'Ceci est un message.',
|
||||
0,
|
||||
0,
|
||||
);
|
||||
$this->assertSame(0, ModelsClaim::count());
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue