Sultan
/
invoice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Add vendor contact id to activities

This commit is contained in:
Hillel Coren 2022-10-18 16:04:03 +03:00
parent 77088182c3
commit a15c929529
2 changed files with 72 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/data/models/entities.dart
View File

@ -719,6 +719,10 @@ abstract class ActivityEntity
@BuiltValueField(wireName: 'vendor_id')
String get vendorId;
@nullable
@BuiltValueField(wireName: 'vendor_contact_id')
String get vendorContactId;
@nullable
@BuiltValueField(wireName: 'token_id')
String get tokenId;
@ -875,9 +879,11 @@ abstract class ActivityEntity
ExpenseEntity recurringExpense,
InvoiceEntity purchaseOrder,
}) {
ClientContactEntity contact;
ClientContactEntity clientContact;
VendorContactEntity vendorContact;
if (client != null && contactId != null && contactId.isNotEmpty) {
contact = client.getContact(contactId);
vendorContact = vendor.getContact(vendorContactId);
clientContact = client.getContact(contactId);
}
activity =
@ -889,8 +895,26 @@ abstract class ActivityEntity
activity = activity.replaceFirst(
':recurring_expense', recurringExpense?.number ?? '');
activity = activity.replaceFirst(':quote', quote?.number ?? '');
activity = activity.replaceFirst(':contact',
contact?.fullName ?? client?.displayName ?? user?.fullName ?? '');
if ([
kActivityViewPurchaseOrder,
kActivityAcceptPurchaseOrder,
].contains(activityTypeId)) {
activity = activity.replaceFirst(
':contact',
(vendorContact?.fullName ?? '').isNotEmpty
? vendorContact.fullName
: (vendor?.name ?? '').isNotEmpty
? vendor.name
: user?.fullName ?? '');
} else {
activity = activity.replaceFirst(
':contact',
(clientContact?.fullName ?? '').isNotEmpty
? clientContact.fullName
: (client?.displayName ?? '').isNotEmpty
? client.displayName
: user?.fullName ?? '');
}
activity = activity.replaceFirst(
':payment', payment?.transactionReferenceOrNumber ?? '');
activity = activity.replaceFirst(':credit', credit?.number ?? '');
@ -903,6 +927,9 @@ abstract class ActivityEntity
':recurring_expense', vendor?.name ?? ''); // TODO implement
activity = activity.replaceAll(' ', ' ');
print('## Activityy: IS $activity');
print('##');
return activity;
}

59
lib/data/models/entities.g.dart
View File

@ -628,6 +628,13 @@ class _$ActivityEntitySerializer
..add(serializers.serialize(value,
specifiedType: const FullType(String)));
}
value = object.vendorContactId;
if (value != null) {
result
..add('vendor_contact_id')
..add(serializers.serialize(value,
specifiedType: const FullType(String)));
}
value = object.tokenId;
if (value != null) {
result
@ -737,6 +744,10 @@ class _$ActivityEntitySerializer
result.vendorId = serializers.deserialize(value,
specifiedType: const FullType(String)) as String;
break;
case 'vendor_contact_id':
result.vendorContactId = serializers.deserialize(value,
specifiedType: const FullType(String)) as String;
break;
case 'token_id':
result.tokenId = serializers.deserialize(value,
specifiedType: const FullType(String)) as String;
@ -1077,6 +1088,8 @@ class _$ActivityEntity extends ActivityEntity {
@override
final String vendorId;
@override
final String vendorContactId;
@override
final String tokenId;
@override
final InvoiceHistoryEntity history;
@ -1105,6 +1118,7 @@ class _$ActivityEntity extends ActivityEntity {
this.taskId,
this.projectId,
this.vendorId,
this.vendorContactId,
this.tokenId,
this.history})
: super._() {
@ -1149,6 +1163,7 @@ class _$ActivityEntity extends ActivityEntity {
taskId == other.taskId &&
projectId == other.projectId &&
vendorId == other.vendorId &&
vendorContactId == other.vendorContactId &&
tokenId == other.tokenId &&
history == other.history;
}
@ -1174,24 +1189,24 @@ class _$ActivityEntity extends ActivityEntity {
$jc(
$jc(
$jc(
$jc($jc($jc($jc(0, notes.hashCode), key.hashCode), activityTypeId.hashCode),
clientId.hashCode),
userId.hashCode),
invoiceId.hashCode),
recurringInvoiceId.hashCode),
recurringExpenseId.hashCode),
purchaseOrderId.hashCode),
quoteId.hashCode),
paymentId.hashCode),
creditId.hashCode),
updatedAt.hashCode),
expenseId.hashCode),
isSystem.hashCode),
ip.hashCode),
contactId.hashCode),
taskId.hashCode),
projectId.hashCode),
vendorId.hashCode),
$jc($jc($jc($jc($jc(0, notes.hashCode), key.hashCode), activityTypeId.hashCode), clientId.hashCode),
userId.hashCode),
invoiceId.hashCode),
recurringInvoiceId.hashCode),
recurringExpenseId.hashCode),
purchaseOrderId.hashCode),
quoteId.hashCode),
paymentId.hashCode),
creditId.hashCode),
updatedAt.hashCode),
expenseId.hashCode),
isSystem.hashCode),
ip.hashCode),
contactId.hashCode),
taskId.hashCode),
projectId.hashCode),
vendorId.hashCode),
vendorContactId.hashCode),
tokenId.hashCode),
history.hashCode));
}
@ -1219,6 +1234,7 @@ class _$ActivityEntity extends ActivityEntity {
..add('taskId', taskId)
..add('projectId', projectId)
..add('vendorId', vendorId)
..add('vendorContactId', vendorContactId)
..add('tokenId', tokenId)
..add('history', history))
.toString();
@ -1313,6 +1329,11 @@ class ActivityEntityBuilder
String get vendorId => _$this._vendorId;
set vendorId(String vendorId) => _$this._vendorId = vendorId;
String _vendorContactId;
String get vendorContactId => _$this._vendorContactId;
set vendorContactId(String vendorContactId) =>
_$this._vendorContactId = vendorContactId;
String _tokenId;
String get tokenId => _$this._tokenId;
set tokenId(String tokenId) => _$this._tokenId = tokenId;
@ -1347,6 +1368,7 @@ class ActivityEntityBuilder
_taskId = $v.taskId;
_projectId = $v.projectId;
_vendorId = $v.vendorId;
_vendorContactId = $v.vendorContactId;
_tokenId = $v.tokenId;
_history = $v.history?.toBuilder();
_$v = null;
@ -1396,6 +1418,7 @@ class ActivityEntityBuilder
taskId: taskId,
projectId: projectId,
vendorId: vendorId,
vendorContactId: vendorContactId,
tokenId: tokenId,
history: _history?.build());
} catch (_) {