Merge branch 'develop'

lib/constants.dart

@@ -303,6 +303,7 @@ const kEQuoteTypes = [
 ];
 
 const String kCountryUnitedStates = '840';
+const String kCountryUnitedKingdom = '826';
 const String kCountryAustralia = '36';
 const String kCountryCanada = '124';
 const String kCountrySwitzerland = '756';
@@ -829,6 +830,7 @@ const String kDefaultLightBorderColor = '#dfdfdf';
 const String kTaxRegionUnitedStates = 'US';
 const String kTaxRegionEurope = 'EU';
 const String kTaxRegionAustralia = 'AU';
+const String kTaxRegionUnitedKingdom = 'UK';
 
 const String kReportGroupDay = 'day';
 const String kReportGroupWeek = 'week';
@@ -1145,3 +1147,6 @@ const String kActivityQuoteEmailReminder1 = '142';
 const String kActivityAutoBillSuccess = '143';
 const String kActivityAutoBillFailure = '144';
 const String kActivityEInvoiceSuccess = '145';
+const String kActivityEInvoiceDeliverySuccess = '146';
+const String kActivityEInvoiceDeliveryFailure = '147';
+const String kActivityEExpenseCreated = '148';

lib/data/models/client_model.dart

@@ -691,7 +691,7 @@ abstract class ClientEntity extends Object
       }
     }
 
-    if (!isDeleted! && multiselect) {
+    if (!isDeleted!) {
       actions.add(EntityAction.bulkUpdate);
     }
 

lib/data/models/entities.dart

@@ -830,6 +830,8 @@ abstract class ActivityEntity
       kActivityAutoBillSuccess,
       kActivityAutoBillFailure,
       kActivityEInvoiceSuccess,
+      kActivityEInvoiceDeliverySuccess,
+      kActivityEInvoiceDeliveryFailure,
     ].contains(activityTypeId)) {
       return EntityType.invoice;
     } else if ([
@@ -881,6 +883,7 @@ abstract class ActivityEntity
       kActivityRestoreExpense,
       kActivityUpdateExpense,
       kActivityExpenseNotificationSent,
+      kActivityEExpenseCreated,
     ].contains(activityTypeId)) {
       return EntityType.expense;
     } else if ([
@@ -1017,6 +1020,8 @@ abstract class ActivityEntity
         ':recurring_expense', vendor?.name ?? ''); // TODO implement
     activity = activity.replaceAll('  ', ' ');
 
+    activity = activity.replaceFirst(' - :notes', '');
+
     return activity;
   }
 

lib/data/models/tax_model.dart

@@ -207,6 +207,7 @@ abstract class TaxConfigSubregionEntity
       taxRate: 0,
       reducedTaxRate: 0,
       taxName: '',
+      vatNumber: '',
     );
   }
 
@@ -228,13 +229,17 @@ abstract class TaxConfigSubregionEntity
   @BuiltValueField(wireName: 'reduced_tax_rate')
   double get reducedTaxRate;
 
+  @BuiltValueField(wireName: 'vat_number')
+  String get vatNumber;
+
   // ignore: unused_element
   static void _initializeBuilder(TaxConfigSubregionEntityBuilder builder) =>
       builder
         ..applyTax = false
         ..taxName = ''
         ..reducedTaxRate = 0
-        ..taxRate = 0;
+        ..taxRate = 0
+        ..vatNumber = '';
 
   static Serializer<TaxConfigSubregionEntity> get serializer =>
       _$taxConfigSubregionEntitySerializer;

lib/data/models/vendor_model.dart

@@ -84,6 +84,7 @@ class VendorFields {
   static const String contactEmail = 'contact_email';
   static const String classification = 'classification';
   static const String routingId = 'routing_id';
+  static const String isTaxExempt = 'is_tax_exempt';
 }
 
 abstract class VendorEntity extends Object
@@ -124,6 +125,7 @@ abstract class VendorEntity extends Object
       updatedAt: 0,
       archivedAt: 0,
       isDeleted: false,
+      isTaxExempt: false,
       assignedUserId: user?.id ?? '',
       createdUserId: '',
       createdAt: 0,
@@ -224,6 +226,9 @@ abstract class VendorEntity extends Object
   @BuiltValueField(wireName: 'routing_id')
   String get routingId;
 
+  @BuiltValueField(wireName: 'is_tax_exempt')
+  bool get isTaxExempt;
+
   @BuiltValueField(wireName: 'last_login')
   int get lastLogin;
 
@@ -273,6 +278,16 @@ abstract class VendorEntity extends Object
       actions.add(EntityAction.addComment);
     }
 
+    /*
+    if (!isDeleted!) {
+      actions.add(EntityAction.bulkUpdate);
+    }
+    */
+
+    if (userCompany!.isAdmin && !multiselect) {
+      actions.add(EntityAction.merge);
+    }
+
     if (actions.isNotEmpty && actions.last != null) {
       actions.add(null);
     }
@@ -534,6 +549,7 @@ abstract class VendorEntity extends Object
     ..lastLogin = 0
     ..routingId = ''
     ..languageId = ''
+    ..isTaxExempt = false
     ..displayName = ''
     ..classification = '';
 

lib/data/repositories/vendor_repository.dart

@@ -89,6 +89,24 @@ class VendorRepository {
     return vendorResponse.data;
   }
 
+  Future<VendorEntity> merge({
+    required Credentials credentials,
+    required String? vendorId,
+    required String? mergeIntoVendorId,
+    required String? password,
+    required String? idToken,
+  }) async {
+    final url = credentials.url + '/vendors/$mergeIntoVendorId/$vendorId/merge';
+
+    final dynamic response = await webClient.post(url, credentials.token,
+        password: password, idToken: idToken);
+
+    final VendorItemResponse clientResponse =
+        serializers.deserializeWith(VendorItemResponse.serializer, response)!;
+
+    return clientResponse.data;
+  }
+
   Future<VendorEntity> uploadDocument(
       Credentials credentials,
       BaseEntity entity,

lib/main.dart

@@ -107,6 +107,7 @@ class MyHttpOverrides extends HttpOverrides {
   HttpClient createHttpClient(SecurityContext? context) {
     return super.createHttpClient(context)
       ..badCertificateCallback = (X509Certificate cert, String host, int port) {
+        print('## Comparing ${this.host} to $host');
         return this.host == host;
       };
   }