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

Payments

This commit is contained in:
Hillel Coren 2020-01-03 12:36:11 +02:00
parent 2d266fc0b8
commit 2ba52c0486
16 changed files with 323 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
lib/data/models/payment_model.dart
View File

@ -81,6 +81,7 @@ abstract class PaymentEntity extends Object
customValue2: '',
customValue3: '',
customValue4: '',
paymentables: BuiltList<PaymentableEntity>(),
);
}
@ -159,6 +160,7 @@ abstract class PaymentEntity extends Object
@BuiltValueField(wireName: 'vendor_id')
String get vendorId;
BuiltList<PaymentableEntity> get paymentables;
int compareTo(PaymentEntity credit, String sortField, bool sortAscending) {
int response = 0;
@ -278,16 +280,14 @@ abstract class PaymentEntity extends Object
double get listDisplayAmount => amount;
bool isBetween(String startDate, String endDate) {
return startDate.compareTo(date) <= 0 &&
endDate.compareTo(date) >= 0;
return startDate.compareTo(date) <= 0 && endDate.compareTo(date) >= 0;
}
@override
FormatNumberType get listDisplayAmountType => FormatNumberType.money;
double get completedAmount {
if ([kPaymentStatusVoided, kPaymentStatusFailed]
.contains(statusId)) {
if ([kPaymentStatusVoided, kPaymentStatusFailed].contains(statusId)) {
return 0.0;
}
@ -296,3 +296,58 @@ abstract class PaymentEntity extends Object
static Serializer<PaymentEntity> get serializer => _$paymentEntitySerializer;
}
abstract class PaymentableEntity extends Object
with SelectableEntity
implements Built<PaymentableEntity, PaymentableEntityBuilder> {
factory PaymentableEntity() {
return _$PaymentableEntity._(
id: '',
invoiceId: '',
amount: 0,
);
}
PaymentableEntity._();
@BuiltValueField(wireName: 'invoice_id')
String get invoiceId;
double get amount;
/*
@override
bool matchesFilter(String filter) {
if (filter == null || filter.isEmpty) {
return true;
}
filter = filter.toLowerCase();
return false;
}
@override
String matchesFilterValue(String filter) {
if (filter == null || filter.isEmpty) {
return null;
}
filter = filter.toLowerCase();
return null;
}
@override
String get listDisplayName {
return name;
}
@override
double get listDisplayAmount => null;
*/
static Serializer<PaymentableEntity> get serializer =>
_$paymentableEntitySerializer;
}

283
lib/data/models/payment_model.g.dart
View File

@ -12,6 +12,8 @@ Serializer<PaymentItemResponse> _$paymentItemResponseSerializer =
new _$PaymentItemResponseSerializer();
Serializer<PaymentEntity> _$paymentEntitySerializer =
new _$PaymentEntitySerializer();
Serializer<PaymentableEntity> _$paymentableEntitySerializer =
new _$PaymentableEntitySerializer();
class _$PaymentListResponseSerializer
implements StructuredSerializer<PaymentListResponse> {
@ -135,6 +137,10 @@ class _$PaymentEntitySerializer implements StructuredSerializer<PaymentEntity> {
'is_manual',
serializers.serialize(object.isManual,
specifiedType: const FullType(bool)),
'paymentables',
serializers.serialize(object.paymentables,
specifiedType: const FullType(
BuiltList, const [const FullType(PaymentableEntity)])),
];
if (object.number != null) {
result
@ -353,6 +359,12 @@ class _$PaymentEntitySerializer implements StructuredSerializer<PaymentEntity> {
result.vendorId = serializers.deserialize(value,
specifiedType: const FullType(String)) as String;
break;
case 'paymentables':
result.paymentables.replace(serializers.deserialize(value,
specifiedType: const FullType(
BuiltList, const [const FullType(PaymentableEntity)]))
as BuiltList<dynamic>);
break;
case 'isChanged':
result.isChanged = serializers.deserialize(value,
specifiedType: const FullType(bool)) as bool;
@ -392,6 +404,64 @@ class _$PaymentEntitySerializer implements StructuredSerializer<PaymentEntity> {
}
}
class _$PaymentableEntitySerializer
implements StructuredSerializer<PaymentableEntity> {
@override
final Iterable<Type> types = const [PaymentableEntity, _$PaymentableEntity];
@override
final String wireName = 'PaymentableEntity';
@override
Iterable<Object> serialize(Serializers serializers, PaymentableEntity object,
{FullType specifiedType = FullType.unspecified}) {
final result = <Object>[
'invoice_id',
serializers.serialize(object.invoiceId,
specifiedType: const FullType(String)),
'amount',
serializers.serialize(object.amount,
specifiedType: const FullType(double)),
];
if (object.id != null) {
result
..add('id')
..add(serializers.serialize(object.id,
specifiedType: const FullType(String)));
}
return result;
}
@override
PaymentableEntity deserialize(
Serializers serializers, Iterable<Object> serialized,
{FullType specifiedType = FullType.unspecified}) {
final result = new PaymentableEntityBuilder();
final iterator = serialized.iterator;
while (iterator.moveNext()) {
final key = iterator.current as String;
iterator.moveNext();
final dynamic value = iterator.current;
switch (key) {
case 'invoice_id':
result.invoiceId = serializers.deserialize(value,
specifiedType: const FullType(String)) as String;
break;
case 'amount':
result.amount = serializers.deserialize(value,
specifiedType: const FullType(double)) as double;
break;
case 'id':
result.id = serializers.deserialize(value,
specifiedType: const FullType(String)) as String;
break;
}
}
return result.build();
}
}
class _$PaymentListResponse extends PaymentListResponse {
@override
final BuiltList<PaymentEntity> data;
@ -621,6 +691,8 @@ class _$PaymentEntity extends PaymentEntity {
@override
final String vendorId;
@override
final BuiltList<PaymentableEntity> paymentables;
@override
final bool isChanged;
@override
final int createdAt;
@ -660,6 +732,7 @@ class _$PaymentEntity extends PaymentEntity {
this.isManual,
this.projectId,
this.vendorId,
this.paymentables,
this.isChanged,
this.createdAt,
this.updatedAt,
@ -688,6 +761,9 @@ class _$PaymentEntity extends PaymentEntity {
if (isManual == null) {
throw new BuiltValueNullFieldError('PaymentEntity', 'isManual');
}
if (paymentables == null) {
throw new BuiltValueNullFieldError('PaymentEntity', 'paymentables');
}
}
@override
@ -720,6 +796,7 @@ class _$PaymentEntity extends PaymentEntity {
isManual == other.isManual &&
projectId == other.projectId &&
vendorId == other.vendorId &&
paymentables == other.paymentables &&
isChanged == other.isChanged &&
createdAt == other.createdAt &&
updatedAt == other.updatedAt &&
@ -750,18 +827,18 @@ class _$PaymentEntity extends PaymentEntity {
$jc(
$jc(
$jc(
$jc($jc($jc($jc($jc($jc($jc($jc($jc(0, amount.hashCode), refunded.hashCode), number.hashCode), clientId.hashCode), statusId.hashCode), transactionReference.hashCode), date.hashCode), typeId.hashCode),
invoiceId.hashCode),
privateNotes.hashCode),
customValue1.hashCode),
customValue2.hashCode),
customValue3.hashCode),
customValue4.hashCode),
exchangeRate.hashCode),
exchangeCurrencyId.hashCode),
isManual.hashCode),
projectId.hashCode),
vendorId.hashCode),
$jc($jc($jc($jc($jc($jc($jc($jc($jc($jc(0, amount.hashCode), refunded.hashCode), number.hashCode), clientId.hashCode), statusId.hashCode), transactionReference.hashCode), date.hashCode), typeId.hashCode), invoiceId.hashCode),
privateNotes.hashCode),
customValue1.hashCode),
customValue2.hashCode),
customValue3.hashCode),
customValue4.hashCode),
exchangeRate.hashCode),
exchangeCurrencyId.hashCode),
isManual.hashCode),
projectId.hashCode),
vendorId.hashCode),
paymentables.hashCode),
isChanged.hashCode),
createdAt.hashCode),
updatedAt.hashCode),
@ -794,6 +871,7 @@ class _$PaymentEntity extends PaymentEntity {
..add('isManual', isManual)
..add('projectId', projectId)
..add('vendorId', vendorId)
..add('paymentables', paymentables)
..add('isChanged', isChanged)
..add('createdAt', createdAt)
..add('updatedAt', updatedAt)
@ -888,6 +966,12 @@ class PaymentEntityBuilder
String get vendorId => _$this._vendorId;
set vendorId(String vendorId) => _$this._vendorId = vendorId;
ListBuilder<PaymentableEntity> _paymentables;
ListBuilder<PaymentableEntity> get paymentables =>
_$this._paymentables ??= new ListBuilder<PaymentableEntity>();
set paymentables(ListBuilder<PaymentableEntity> paymentables) =>
_$this._paymentables = paymentables;
bool _isChanged;
bool get isChanged => _$this._isChanged;
set isChanged(bool isChanged) => _$this._isChanged = isChanged;
@ -945,6 +1029,7 @@ class PaymentEntityBuilder
_isManual = _$v.isManual;
_projectId = _$v.projectId;
_vendorId = _$v.vendorId;
_paymentables = _$v.paymentables?.toBuilder();
_isChanged = _$v.isChanged;
_createdAt = _$v.createdAt;
_updatedAt = _$v.updatedAt;
@ -973,35 +1058,153 @@ class PaymentEntityBuilder
@override
_$PaymentEntity build() {
_$PaymentEntity _$result;
try {
_$result = _$v ??
new _$PaymentEntity._(
amount: amount,
refunded: refunded,
number: number,
clientId: clientId,
statusId: statusId,
transactionReference: transactionReference,
date: date,
typeId: typeId,
invoiceId: invoiceId,
privateNotes: privateNotes,
customValue1: customValue1,
customValue2: customValue2,
customValue3: customValue3,
customValue4: customValue4,
exchangeRate: exchangeRate,
exchangeCurrencyId: exchangeCurrencyId,
isManual: isManual,
projectId: projectId,
vendorId: vendorId,
paymentables: paymentables.build(),
isChanged: isChanged,
createdAt: createdAt,
updatedAt: updatedAt,
archivedAt: archivedAt,
isDeleted: isDeleted,
createdUserId: createdUserId,
assignedUserId: assignedUserId,
id: id);
} catch (_) {
String _$failedField;
try {
_$failedField = 'paymentables';
paymentables.build();
} catch (e) {
throw new BuiltValueNestedFieldError(
'PaymentEntity', _$failedField, e.toString());
}
rethrow;
}
replace(_$result);
return _$result;
}
}
class _$PaymentableEntity extends PaymentableEntity {
@override
final String invoiceId;
@override
final double amount;
@override
final String id;
factory _$PaymentableEntity(
[void Function(PaymentableEntityBuilder) updates]) =>
(new PaymentableEntityBuilder()..update(updates)).build();
_$PaymentableEntity._({this.invoiceId, this.amount, this.id}) : super._() {
if (invoiceId == null) {
throw new BuiltValueNullFieldError('PaymentableEntity', 'invoiceId');
}
if (amount == null) {
throw new BuiltValueNullFieldError('PaymentableEntity', 'amount');
}
}
@override
PaymentableEntity rebuild(void Function(PaymentableEntityBuilder) updates) =>
(toBuilder()..update(updates)).build();
@override
PaymentableEntityBuilder toBuilder() =>
new PaymentableEntityBuilder()..replace(this);
@override
bool operator ==(Object other) {
if (identical(other, this)) return true;
return other is PaymentableEntity &&
invoiceId == other.invoiceId &&
amount == other.amount &&
id == other.id;
}
@override
int get hashCode {
return $jf(
$jc($jc($jc(0, invoiceId.hashCode), amount.hashCode), id.hashCode));
}
@override
String toString() {
return (newBuiltValueToStringHelper('PaymentableEntity')
..add('invoiceId', invoiceId)
..add('amount', amount)
..add('id', id))
.toString();
}
}
class PaymentableEntityBuilder
implements Builder<PaymentableEntity, PaymentableEntityBuilder> {
_$PaymentableEntity _$v;
String _invoiceId;
String get invoiceId => _$this._invoiceId;
set invoiceId(String invoiceId) => _$this._invoiceId = invoiceId;
double _amount;
double get amount => _$this._amount;
set amount(double amount) => _$this._amount = amount;
String _id;
String get id => _$this._id;
set id(String id) => _$this._id = id;
PaymentableEntityBuilder();
PaymentableEntityBuilder get _$this {
if (_$v != null) {
_invoiceId = _$v.invoiceId;
_amount = _$v.amount;
_id = _$v.id;
_$v = null;
}
return this;
}
@override
void replace(PaymentableEntity other) {
if (other == null) {
throw new ArgumentError.notNull('other');
}
_$v = other as _$PaymentableEntity;
}
@override
void update(void Function(PaymentableEntityBuilder) updates) {
if (updates != null) updates(this);
}
@override
_$PaymentableEntity build() {
final _$result = _$v ??
new _$PaymentEntity._(
amount: amount,
refunded: refunded,
number: number,
clientId: clientId,
statusId: statusId,
transactionReference: transactionReference,
date: date,
typeId: typeId,
invoiceId: invoiceId,
privateNotes: privateNotes,
customValue1: customValue1,
customValue2: customValue2,
customValue3: customValue3,
customValue4: customValue4,
exchangeRate: exchangeRate,
exchangeCurrencyId: exchangeCurrencyId,
isManual: isManual,
projectId: projectId,
vendorId: vendorId,
isChanged: isChanged,
createdAt: createdAt,
updatedAt: updatedAt,
archivedAt: archivedAt,
isDeleted: isDeleted,
createdUserId: createdUserId,
assignedUserId: assignedUserId,
id: id);
new _$PaymentableEntity._(invoiceId: invoiceId, amount: amount, id: id);
replace(_$result);
return _$result;
}

1
lib/data/models/serializers.dart
View File

@ -108,6 +108,7 @@ part 'serializers.g.dart';
TaxRateItemResponse,
TaxRateListResponse,
// STARTER: serializers - do not remove comment
PaymentableEntity,
UserEntity,
UserListResponse,
UserItemResponse,

2
lib/data/models/serializers.g.dart
View File

@ -99,6 +99,7 @@ Serializers _$serializers = (new Serializers().toBuilder()
..add(PaymentTypeItemResponse.serializer)
..add(PaymentTypeListResponse.serializer)
..add(PaymentUIState.serializer)
..add(PaymentableEntity.serializer)
..add(PrefState.serializer)
..add(ProductEntity.serializer)
..add(ProductItemResponse.serializer)
@ -344,6 +345,7 @@ Serializers _$serializers = (new Serializers().toBuilder()
..addBuilderFactory(const FullType(BuiltList, const [const FullType(LanguageEntity)]), () => new ListBuilder<LanguageEntity>())
..addBuilderFactory(const FullType(BuiltList, const [const FullType(PaymentEntity)]), () => new ListBuilder<PaymentEntity>())
..addBuilderFactory(const FullType(BuiltList, const [const FullType(PaymentTypeEntity)]), () => new ListBuilder<PaymentTypeEntity>())
..addBuilderFactory(const FullType(BuiltList, const [const FullType(PaymentableEntity)]), () => new ListBuilder<PaymentableEntity>())
..addBuilderFactory(const FullType(BuiltList, const [const FullType(ProductEntity)]), () => new ListBuilder<ProductEntity>())
..addBuilderFactory(const FullType(BuiltList, const [const FullType(ProjectEntity)]), () => new ListBuilder<ProjectEntity>())
..addBuilderFactory(const FullType(BuiltList, const [const FullType(SizeEntity)]), () => new ListBuilder<SizeEntity>())

2
lib/data/repositories/auth_repository.dart
View File

@ -104,7 +104,7 @@ class AuthRepository {
'company.clients',
'company.products',
'company.invoices',
'company.payments',
'company.payments.paymentables',
'company.quotes',
//'company.credits',
//'company.tasks',

2
lib/data/repositories/document_repository.dart
View File

@ -52,7 +52,7 @@ class DocumentRepository {
Future<List<DocumentEntity>> bulkAction(
Credentials credentials, List<String> ids, EntityAction action) async {
var url = credentials.url + '/documents/bulk?include=activities';
var url = credentials.url + '/documents/bulk?';
if (action != null) {
url += '&action=' + action.toString();
}

2
lib/data/repositories/expense_repository.dart
View File

@ -52,7 +52,7 @@ class ExpenseRepository {
Future<List<ExpenseEntity>> bulkAction(
Credentials credentials, List<String> ids, EntityAction action) async {
var url = credentials.url + '/expenses/bulk?include=activities';
var url = credentials.url + '/expenses/bulk?';
if (action != null) {
url += '&action=' + action.toString();
}

2
lib/data/repositories/group_repository.dart
View File

@ -44,7 +44,7 @@ class GroupRepository {
Future<List<GroupEntity>> bulkAction(
Credentials credentials, List<String> ids, EntityAction action) async {
var url = credentials.url + '/groups/bulk?include=activities';
var url = credentials.url + '/groups/bulk?';
if (action != null) {
url += '&action=' + action.toString();
}

4
lib/data/repositories/invoice_repository.dart
View File

@ -77,9 +77,9 @@ class InvoiceRepository {
credentials.url + '/invoices?include=invitations', credentials.token,
data: json.encode(data));
} else {
var url = '${credentials.url}/invoices/${invoice.id}';
var url = '${credentials.url}/invoices/${invoice.id}?include=invitations';
if (action != null) {
url += '?action=' + action.toString();
url += '&action=' + action.toString();
}
response =
await webClient.put(url, credentials.token, data: json.encode(data));

10
lib/data/repositories/payment_repository.dart
View File

@ -19,7 +19,7 @@ class PaymentRepository {
Future<BuiltList<PaymentEntity>> loadList(
Credentials credentials, int updatedAt) async {
String url = credentials.url + '/payments?';
String url = credentials.url + '/payments?include=paymentables';
if (updatedAt > 0) {
url += '&updated_at=${updatedAt - kUpdatedAtBufferSeconds}';
@ -41,7 +41,7 @@ class PaymentRepository {
Future<List<PaymentEntity>> bulkAction(
Credentials credentials, List<String> ids, EntityAction action) async {
var url = credentials.url + '/payments/bulk?include=activities';
var url = credentials.url + '/payments/bulk?include=paymentables';
if (action != null) {
url += '&action=' + action.toString();
}
@ -59,14 +59,14 @@ class PaymentRepository {
dynamic response;
if (payment.isNew) {
var url = credentials.url + '/payments';
var url = credentials.url + '/payments?include=paymentables';
if (sendEmail) {
url += '?email_receipt=true';
url += '&email_receipt=true';
}
response =
await webClient.post(url, credentials.token, data: json.encode(data));
} else {
var url = '${credentials.url}/payments/${payment.id}?';
var url = '${credentials.url}/payments/${payment.id}?include=paymentables';
if (sendEmail) {
url += '&email_receipt=true';
}

2
lib/data/repositories/product_repository.dart
View File

@ -41,7 +41,7 @@ class ProductRepository {
Future<List<ProductEntity>> bulkAction(
Credentials credentials, List<String> ids, EntityAction action) async {
var url = credentials.url + '/products/bulk?include=activities';
var url = credentials.url + '/products/bulk?';
if (action != null) {
url += '&action=' + action.toString();
}

2
lib/data/repositories/project_repository.dart
View File

@ -52,7 +52,7 @@ class ProjectRepository {
Future<List<ProjectEntity>> bulkAction(
Credentials credentials, List<String> ids, EntityAction action) async {
var url = credentials.url + '/projects/bulk?include=activities';
var url = credentials.url + '/projects/bulk?';
if (action != null) {
url += '&action=' + action.toString();
}

4
lib/data/repositories/quote_repository.dart
View File

@ -54,7 +54,7 @@ class QuoteRepository {
Future<List<InvoiceEntity>> bulkAction(
Credentials credentials, List<String> ids, EntityAction action) async {
var url = credentials.url + '/quotes/bulk?include=activities';
var url = credentials.url + '/quotes/bulk?include=invitations';
if (action != null) {
url += '&action=' + action.toString();
}
@ -77,7 +77,7 @@ class QuoteRepository {
credentials.url + '/quotes?include=invitations', credentials.token,
data: json.encode(data));
} else {
var url = '${credentials.url}/quotes/${quote.id}';
var url = '${credentials.url}/quotes/${quote.id}?include=invitations';
if (action != null) {
url += '?action=' + action.toString();
}

2
lib/data/repositories/task_repository.dart
View File

@ -51,7 +51,7 @@ class TaskRepository {
Future<List<TaskEntity>> bulkAction(
Credentials credentials, List<String> ids, EntityAction action) async {
var url = credentials.url + '/tasks/bulk?include=activities';
var url = credentials.url + '/tasks/bulk?';
if (action != null) {
url += '&action=' + action.toString();
}

2
lib/data/repositories/tax_rate_repository.dart
View File

@ -44,7 +44,7 @@ class TaxRateRepository {
Future<List<TaxRateEntity>> bulkAction(
Credentials credentials, List<String> ids, EntityAction action) async {
var url = credentials.url + '/tax_rates/bulk?include=activities';
var url = credentials.url + '/tax_rates/bulk?';
if (action != null) {
url += '&action=' + action.toString();
}

2
lib/data/repositories/vendor_repository.dart
View File

@ -52,7 +52,7 @@ class VendorRepository {
Future<List<VendorEntity>> bulkAction(
Credentials credentials, List<String> ids, EntityAction action) async {
var url = credentials.url + '/vendors/bulk?include=activities';
var url = credentials.url + '/vendors/bulk?';
if (action != null) {
url += '&action=' + action.toString();
}