tsanie/ui-lib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/master'

Browse Source
This commit is contained in:
Tsanie Lily 2023-04-24 17:39:22 +08:00
commit 08e58b3abc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/app/communications/customer.js
View File

@ -636,7 +636,7 @@ class CustomerCommunication {
iconCol, iconCol,
nameCol, nameCol,
{ key: 'Email', width: 180 }, { key: 'Email', width: 180 },
{ key: 'MobilePhone', width: 130 }, { key: 'MobilePhoneDisplayText', width: 130 },
createEditCol(this), createEditCol(this),
{ {
key: 'delete', key: 'delete',
@ -721,7 +721,7 @@ class CustomerCommunication {
iconCol, iconCol,
nameCol, nameCol,
{ key: 'Email', width: 180 }, { key: 'Email', width: 180 },
{ key: 'MobilePhone', width: 130 }, { key: 'MobilePhoneDisplayText', width: 130 },
createEditCol(this), createEditCol(this),
{ {
key: 'delete', key: 'delete',
@ -874,7 +874,7 @@ class CustomerCommunication {
}, },
{ key: 'Name', width: 160 }, { key: 'Name', width: 160 },
{ key: 'Email', width: 180 }, { key: 'Email', width: 180 },
{ key: 'MobilePhone', width: 130 }, { key: 'MobilePhoneDisplayText', width: 130 },
{ {
key: 'edit', key: 'edit',
...buttonCol, ...buttonCol,
@ -1053,13 +1053,13 @@ class CustomerCommunication {
contacts.find(c => c.Email === oriph) : contacts.find(c => c.Email === oriph) :
contacts.find(c => c.MobilePhone === oriph); contacts.find(c => c.MobilePhone === oriph);
if (c != null) { if (c != null) {
cname = `${email ? c.Email : c.MobilePhone} - ${c.Name}`; cname = `${email ? c.Email : c.MobilePhoneDisplayText} - ${c.Name}`;
} else if (followers?.length > 0) { } else if (followers?.length > 0) {
c = email ? c = email ?
followers.find(f => f.Email === oriph) : followers.find(f => f.Email === oriph) :
followers.find(f => f.MobilePhone === oriph); followers.find(f => f.MobilePhone === oriph);
if (c != null) { if (c != null) {
cname = `${email ? c.Email : c.MobilePhone} - ${c.Name}`; cname = `${email ? c.Email : c.MobilePhoneDisplayText} - ${c.Name}`;
} }
} }
} }