Merge branch 'feature/crmAdmin0717' into develop
This commit is contained in:
@@ -146,7 +146,7 @@ class CustomerService
|
|||||||
$customer['channel_name'] = empty($customer['channel_id'])?'':Channel::where(['id'=>$customer['channel_id']])->value($nameLang);
|
$customer['channel_name'] = empty($customer['channel_id'])?'':Channel::where(['id'=>$customer['channel_id']])->value($nameLang);
|
||||||
// $customer['last_follow'] = $last_follow;
|
// $customer['last_follow'] = $last_follow;
|
||||||
|
|
||||||
$customer['enter_user_name'] = empty($customer['enter_user_id']) ? '' : User::find($customer['enter_user_id'])->value('name');
|
$customer['enter_user_name'] = empty($customer['enter_user_id']) ? '' : User::where('id',$customer['enter_user_id'])->value('name');
|
||||||
|
|
||||||
if ($tag) {
|
if ($tag) {
|
||||||
foreach ($customer['tags'] as &$tag) {
|
foreach ($customer['tags'] as &$tag) {
|
||||||
|
|||||||
Reference in New Issue
Block a user