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

Fix sorting payments by number

This commit is contained in:
Hillel Coren 2024-01-15 13:51:48 +02:00
parent 21e32df61e
commit c789723360
7 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/data/models/client_model.dart
View File

@ -432,8 +432,7 @@ abstract class ClientEntity extends Object
response = clientA!.idNumber.compareTo(clientB!.idNumber);
break;
case ClientFields.number:
response = compareNatural(
clientA!.number.toLowerCase(), clientB!.number.toLowerCase());
response = compareNatural(clientA!.number, clientB!.number);
break;
case ClientFields.website:
response = clientA!.website

3
lib/data/models/expense_model.dart
View File

@ -468,8 +468,7 @@ abstract class ExpenseEntity extends Object
expenseA!.documents.length.compareTo(expenseB!.documents.length);
break;
case ExpenseFields.number:
response = compareNatural(
expenseA!.number.toLowerCase(), expenseB!.number.toLowerCase());
response = compareNatural(expenseA!.number, expenseB!.number);
break;
case ExpenseFields.privateNotes:
response = expenseA!.privateNotes.compareTo(expenseB!.privateNotes);

3
lib/data/models/invoice_model.dart
View File

@ -728,8 +728,7 @@ abstract class InvoiceEntity extends Object
invoiceBNumber.startsWith(recurringPrefix!)
? invoiceBNumber.replaceFirst(recurringPrefix, '')
: invoiceBNumber;
response = compareNatural(
invoiceANumber.toLowerCase(), invoiceBNumber.toLowerCase());
response = compareNatural(invoiceANumber, invoiceBNumber);
break;
case InvoiceFields.amount:
response = invoiceA.amount.compareTo(invoiceB.amount);

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

@ -4,7 +4,8 @@ import 'package:built_value/built_value.dart';
import 'package:built_value/serializer.dart';
// Project imports:
import 'package:collection/collection.dart' show IterableExtension;
import 'package:collection/collection.dart'
show IterableExtension, compareNatural;
import 'package:flutter_redux/flutter_redux.dart';
import 'package:invoiceninja_flutter/constants.dart';
import 'package:invoiceninja_flutter/data/models/models.dart';
@ -267,9 +268,7 @@ abstract class PaymentEntity extends Object
response = paymentA!.refunded.compareTo(paymentB!.refunded);
break;
case PaymentFields.number:
response = paymentA!.number
.toLowerCase()
.compareTo(paymentB!.number.toLowerCase());
response = compareNatural(paymentA!.number, paymentB!.number);
break;
case PaymentFields.transactionReference:
response = paymentA!.transactionReference

3
lib/data/models/project_model.dart
View File

@ -2,6 +2,7 @@
import 'package:built_collection/built_collection.dart';
import 'package:built_value/built_value.dart';
import 'package:built_value/serializer.dart';
import 'package:collection/collection.dart';
import 'package:diacritic/diacritic.dart';
import 'package:flutter_redux/flutter_redux.dart';
@ -307,7 +308,7 @@ abstract class ProjectEntity extends Object
projectA.documents.length.compareTo(projectB.documents.length);
break;
case ProjectFields.number:
response = projectA.number.compareTo(projectB.number);
response = compareNatural(projectA.number, projectB.number);
break;
case ProjectFields.customValue1:
response = projectA.customValue1.compareTo(projectB.customValue1);

3
lib/data/models/task_model.dart
View File

@ -790,8 +790,7 @@ abstract class TaskEntity extends Object
response = taskA.documents.length.compareTo(taskB.documents.length);
break;
case TaskFields.number:
response = compareNatural(
taskA.number.toLowerCase(), taskB.number.toLowerCase());
response = compareNatural(taskA.number, taskB.number);
break;
case TaskFields.createdBy:
final userA = userMap[taskA.createdUserId] ?? UserEntity();

3
lib/data/models/vendor_model.dart
View File

@ -327,8 +327,7 @@ abstract class VendorEntity extends Object
vendorA!.documents.length.compareTo(vendorB!.documents.length);
break;
case VendorFields.number:
response = compareNatural(
vendorA!.number.toLowerCase(), vendorB!.number.toLowerCase());
response = compareNatural(vendorA!.number, vendorB!.number);
break;
case VendorFields.address1:
response = vendorA!.address1.compareTo(vendorB!.address1);