new hudId in order in others queries

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/.guides/usage.md

@@ -1,16 +1,16 @@
 # Basic Usage
 
 ```dart
-ExampleConnector.instance.createCourse(createCourseVariables).execute();
+ExampleConnector.instance.getMyTasks(getMyTasksVariables).execute();
-ExampleConnector.instance.updateCourse(updateCourseVariables).execute();
+ExampleConnector.instance.getMemberTaskByIdKey(getMemberTaskByIdKeyVariables).execute();
-ExampleConnector.instance.deleteCourse(deleteCourseVariables).execute();
+ExampleConnector.instance.getMemberTasksByTaskId(getMemberTasksByTaskIdVariables).execute();
-ExampleConnector.instance.listHubs().execute();
+ExampleConnector.instance.listOrders(listOrdersVariables).execute();
-ExampleConnector.instance.getHubById(getHubByIdVariables).execute();
+ExampleConnector.instance.getOrderById(getOrderByIdVariables).execute();
-ExampleConnector.instance.getHubsByOwnerId(getHubsByOwnerIdVariables).execute();
+ExampleConnector.instance.getOrdersByBusinessId(getOrdersByBusinessIdVariables).execute();
-ExampleConnector.instance.filterHubs(filterHubsVariables).execute();
+ExampleConnector.instance.getOrdersByVendorId(getOrdersByVendorIdVariables).execute();
-ExampleConnector.instance.createLevel(createLevelVariables).execute();
+ExampleConnector.instance.getOrdersByStatus(getOrdersByStatusVariables).execute();
-ExampleConnector.instance.updateLevel(updateLevelVariables).execute();
+ExampleConnector.instance.getOrdersByDateRange(getOrdersByDateRangeVariables).execute();
-ExampleConnector.instance.deleteLevel(deleteLevelVariables).execute();
+ExampleConnector.instance.getRapidOrders(getRapidOrdersVariables).execute();
 
 ```
 
@@ -23,8 +23,8 @@ Optional fields can be discovered based on classes that have `Optional` object t
 This is an example of a mutation with an optional field:
 
 ```dart
-await ExampleConnector.instance.updateVendorBenefitPlan({ ... })
+await ExampleConnector.instance.updateLevel({ ... })
-.vendorId(...)
+.name(...)
 .execute();
 ```
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/create_order.dart

@@ -4,7 +4,6 @@ class CreateOrderVariablesBuilder {
   Optional<String> _vendorId = Optional.optional(nativeFromJson, nativeToJson);
   String businessId;
   OrderType orderType;
-  Optional<String> _location = Optional.optional(nativeFromJson, nativeToJson);
   Optional<OrderStatus> _status = Optional.optional((data) => OrderStatus.values.byName(data), enumSerializer);
   Optional<Timestamp> _date = Optional.optional((json) => json['date'] = Timestamp.fromJson(json['date']), defaultSerializer);
   Optional<Timestamp> _startDate = Optional.optional((json) => json['startDate'] = Timestamp.fromJson(json['startDate']), defaultSerializer);
@@ -16,7 +15,7 @@ class CreateOrderVariablesBuilder {
   Optional<AnyValue> _assignedStaff = Optional.optional(AnyValue.fromJson, defaultSerializer);
   Optional<AnyValue> _shifts = Optional.optional(AnyValue.fromJson, defaultSerializer);
   Optional<int> _requested = Optional.optional(nativeFromJson, nativeToJson);
-  Optional<String> _hub = Optional.optional(nativeFromJson, nativeToJson);
+  String teamHubId;
   Optional<AnyValue> _recurringDays = Optional.optional(AnyValue.fromJson, defaultSerializer);
   Optional<Timestamp> _permanentStartDate = Optional.optional((json) => json['permanentStartDate'] = Timestamp.fromJson(json['permanentStartDate']), defaultSerializer);
   Optional<AnyValue> _permanentDays = Optional.optional(AnyValue.fromJson, defaultSerializer);
@@ -29,10 +28,6 @@ class CreateOrderVariablesBuilder {
    _vendorId.value = t;
    return this;
   }
-  CreateOrderVariablesBuilder location(String? t) {
-   _location.value = t;
-   return this;
-  }
   CreateOrderVariablesBuilder status(OrderStatus? t) {
    _status.value = t;
    return this;
@@ -77,10 +72,6 @@ class CreateOrderVariablesBuilder {
    _requested.value = t;
    return this;
   }
-  CreateOrderVariablesBuilder hub(String? t) {
-   _hub.value = t;
-   return this;
-  }
   CreateOrderVariablesBuilder recurringDays(AnyValue? t) {
    _recurringDays.value = t;
    return this;
@@ -106,7 +97,7 @@ class CreateOrderVariablesBuilder {
    return this;
   }
 
-  CreateOrderVariablesBuilder(this._dataConnect, {required  this.businessId,required  this.orderType,});
+  CreateOrderVariablesBuilder(this._dataConnect, {required  this.businessId,required  this.orderType,required  this.teamHubId,});
   Deserializer<CreateOrderData> dataDeserializer = (dynamic json)  => CreateOrderData.fromJson(jsonDecode(json));
   Serializer<CreateOrderVariables> varsSerializer = (CreateOrderVariables vars) => jsonEncode(vars.toJson());
   Future<OperationResult<CreateOrderData, CreateOrderVariables>> execute() {
@@ -114,7 +105,7 @@ class CreateOrderVariablesBuilder {
   }
 
   MutationRef<CreateOrderData, CreateOrderVariables> ref() {
-    CreateOrderVariables vars= CreateOrderVariables(vendorId: _vendorId,businessId: businessId,orderType: orderType,location: _location,status: _status,date: _date,startDate: _startDate,endDate: _endDate,duration: _duration,lunchBreak: _lunchBreak,total: _total,eventName: _eventName,assignedStaff: _assignedStaff,shifts: _shifts,requested: _requested,hub: _hub,recurringDays: _recurringDays,permanentStartDate: _permanentStartDate,permanentDays: _permanentDays,notes: _notes,detectedConflicts: _detectedConflicts,poReference: _poReference,);
+    CreateOrderVariables vars= CreateOrderVariables(vendorId: _vendorId,businessId: businessId,orderType: orderType,status: _status,date: _date,startDate: _startDate,endDate: _endDate,duration: _duration,lunchBreak: _lunchBreak,total: _total,eventName: _eventName,assignedStaff: _assignedStaff,shifts: _shifts,requested: _requested,teamHubId: teamHubId,recurringDays: _recurringDays,permanentStartDate: _permanentStartDate,permanentDays: _permanentDays,notes: _notes,detectedConflicts: _detectedConflicts,poReference: _poReference,);
     return _dataConnect.mutation("createOrder", dataDeserializer, varsSerializer, vars);
   }
 }
@@ -192,7 +183,6 @@ class CreateOrderVariables {
   late final Optional<String>vendorId;
   final String businessId;
   final OrderType orderType;
-  late final Optional<String>location;
   late final Optional<OrderStatus>status;
   late final Optional<Timestamp>date;
   late final Optional<Timestamp>startDate;
@@ -204,7 +194,7 @@ class CreateOrderVariables {
   late final Optional<AnyValue>assignedStaff;
   late final Optional<AnyValue>shifts;
   late final Optional<int>requested;
-  late final Optional<String>hub;
+  final String teamHubId;
   late final Optional<AnyValue>recurringDays;
   late final Optional<Timestamp>permanentStartDate;
   late final Optional<AnyValue>permanentDays;
@@ -215,7 +205,8 @@ class CreateOrderVariables {
   CreateOrderVariables.fromJson(Map<String, dynamic> json):
   
   businessId = nativeFromJson<String>(json['businessId']),
-  orderType = OrderType.values.byName(json['orderType']) {
+  orderType = OrderType.values.byName(json['orderType']),
+  teamHubId = nativeFromJson<String>(json['teamHubId']) {
   
   
     vendorId = Optional.optional(nativeFromJson, nativeToJson);
@@ -224,10 +215,6 @@ class CreateOrderVariables {
   
   
   
-    location = Optional.optional(nativeFromJson, nativeToJson);
-    location.value = json['location'] == null ? null : nativeFromJson<String>(json['location']);
-  
-  
     status = Optional.optional((data) => OrderStatus.values.byName(data), enumSerializer);
     status.value = json['status'] == null ? null : OrderStatus.values.byName(json['status']);
   
@@ -272,9 +259,6 @@ class CreateOrderVariables {
     requested.value = json['requested'] == null ? null : nativeFromJson<int>(json['requested']);
   
   
-    hub = Optional.optional(nativeFromJson, nativeToJson);
-    hub.value = json['hub'] == null ? null : nativeFromJson<String>(json['hub']);
-  
   
     recurringDays = Optional.optional(AnyValue.fromJson, defaultSerializer);
     recurringDays.value = json['recurringDays'] == null ? null : AnyValue.fromJson(json['recurringDays']);
@@ -313,7 +297,6 @@ class CreateOrderVariables {
     return vendorId == otherTyped.vendorId && 
     businessId == otherTyped.businessId && 
     orderType == otherTyped.orderType && 
-    location == otherTyped.location && 
     status == otherTyped.status && 
     date == otherTyped.date && 
     startDate == otherTyped.startDate && 
@@ -325,7 +308,7 @@ class CreateOrderVariables {
     assignedStaff == otherTyped.assignedStaff && 
     shifts == otherTyped.shifts && 
     requested == otherTyped.requested && 
-    hub == otherTyped.hub && 
+    teamHubId == otherTyped.teamHubId && 
     recurringDays == otherTyped.recurringDays && 
     permanentStartDate == otherTyped.permanentStartDate && 
     permanentDays == otherTyped.permanentDays && 
@@ -335,7 +318,7 @@ class CreateOrderVariables {
     
   }
   @override
-  int get hashCode => Object.hashAll([vendorId.hashCode, businessId.hashCode, orderType.hashCode, location.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, duration.hashCode, lunchBreak.hashCode, total.hashCode, eventName.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, hub.hashCode, recurringDays.hashCode, permanentStartDate.hashCode, permanentDays.hashCode, notes.hashCode, detectedConflicts.hashCode, poReference.hashCode]);
+  int get hashCode => Object.hashAll([vendorId.hashCode, businessId.hashCode, orderType.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, duration.hashCode, lunchBreak.hashCode, total.hashCode, eventName.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, teamHubId.hashCode, recurringDays.hashCode, permanentStartDate.hashCode, permanentDays.hashCode, notes.hashCode, detectedConflicts.hashCode, poReference.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -347,9 +330,6 @@ class CreateOrderVariables {
     json['orderType'] = 
     orderType.name
     ;
-    if(location.state == OptionalState.set) {
-      json['location'] = location.toJson();
-    }
     if(status.state == OptionalState.set) {
       json['status'] = status.toJson();
     }
@@ -383,9 +363,7 @@ class CreateOrderVariables {
     if(requested.state == OptionalState.set) {
       json['requested'] = requested.toJson();
     }
-    if(hub.state == OptionalState.set) {
+    json['teamHubId'] = nativeToJson<String>(teamHubId);
-      json['hub'] = hub.toJson();
-    }
     if(recurringDays.state == OptionalState.set) {
       json['recurringDays'] = recurringDays.toJson();
     }
@@ -411,7 +389,6 @@ class CreateOrderVariables {
     required this.vendorId,
     required this.businessId,
     required this.orderType,
-    required this.location,
     required this.status,
     required this.date,
     required this.startDate,
@@ -423,7 +400,7 @@ class CreateOrderVariables {
     required this.assignedStaff,
     required this.shifts,
     required this.requested,
-    required this.hub,
+    required this.teamHubId,
     required this.recurringDays,
     required this.permanentStartDate,
     required this.permanentDays,

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/filter_invoices.dart

@@ -371,15 +371,15 @@ class FilterInvoicesInvoicesBusiness {
 @immutable
 class FilterInvoicesInvoicesOrder {
   final String? eventName;
-  final String? hub;
   final String? deparment;
   final String? poReference;
+  final FilterInvoicesInvoicesOrderTeamHub teamHub;
   FilterInvoicesInvoicesOrder.fromJson(dynamic json):
   
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  hub = json['hub'] == null ? null : nativeFromJson<String>(json['hub']),
   deparment = json['deparment'] == null ? null : nativeFromJson<String>(json['deparment']),
-  poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']);
+  poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']),
+  teamHub = FilterInvoicesInvoicesOrderTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -391,13 +391,13 @@ class FilterInvoicesInvoicesOrder {
 
     final FilterInvoicesInvoicesOrder otherTyped = other as FilterInvoicesInvoicesOrder;
     return eventName == otherTyped.eventName && 
-    hub == otherTyped.hub && 
     deparment == otherTyped.deparment && 
-    poReference == otherTyped.poReference;
+    poReference == otherTyped.poReference && 
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([eventName.hashCode, hub.hashCode, deparment.hashCode, poReference.hashCode]);
+  int get hashCode => Object.hashAll([eventName.hashCode, deparment.hashCode, poReference.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -405,23 +405,67 @@ class FilterInvoicesInvoicesOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (hub != null) {
-      json['hub'] = nativeToJson<String?>(hub);
-    }
     if (deparment != null) {
       json['deparment'] = nativeToJson<String?>(deparment);
     }
     if (poReference != null) {
       json['poReference'] = nativeToJson<String?>(poReference);
     }
+    json['teamHub'] = teamHub.toJson();
     return json;
   }
 
   FilterInvoicesInvoicesOrder({
     this.eventName,
-    this.hub,
     this.deparment,
     this.poReference,
+    required this.teamHub,
+  });
+}
+
+@immutable
+class FilterInvoicesInvoicesOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  FilterInvoicesInvoicesOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final FilterInvoicesInvoicesOrderTeamHub otherTyped = other as FilterInvoicesInvoicesOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  FilterInvoicesInvoicesOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/get_application_by_id.dart

@@ -198,14 +198,14 @@ class GetApplicationByIdApplicationShift {
 class GetApplicationByIdApplicationShiftOrder {
   final String id;
   final String? eventName;
-  final String? location;
+  final GetApplicationByIdApplicationShiftOrderTeamHub teamHub;
   final GetApplicationByIdApplicationShiftOrderBusiness business;
   final GetApplicationByIdApplicationShiftOrderVendor? vendor;
   GetApplicationByIdApplicationShiftOrder.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']),
+  teamHub = GetApplicationByIdApplicationShiftOrderTeamHub.fromJson(json['teamHub']),
   business = GetApplicationByIdApplicationShiftOrderBusiness.fromJson(json['business']),
   vendor = json['vendor'] == null ? null : GetApplicationByIdApplicationShiftOrderVendor.fromJson(json['vendor']);
   @override
@@ -220,13 +220,13 @@ class GetApplicationByIdApplicationShiftOrder {
     final GetApplicationByIdApplicationShiftOrder otherTyped = other as GetApplicationByIdApplicationShiftOrder;
     return id == otherTyped.id && 
     eventName == otherTyped.eventName && 
-    location == otherTyped.location && 
+    teamHub == otherTyped.teamHub && 
     business == otherTyped.business && 
     vendor == otherTyped.vendor;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, location.hashCode, business.hashCode, vendor.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, teamHub.hashCode, business.hashCode, vendor.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -235,9 +235,7 @@ class GetApplicationByIdApplicationShiftOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (location != null) {
+    json['teamHub'] = teamHub.toJson();
-      json['location'] = nativeToJson<String?>(location);
-    }
     json['business'] = business.toJson();
     if (vendor != null) {
       json['vendor'] = vendor!.toJson();
@@ -248,12 +246,58 @@ class GetApplicationByIdApplicationShiftOrder {
   GetApplicationByIdApplicationShiftOrder({
     required this.id,
     this.eventName,
-    this.location,
+    required this.teamHub,
     required this.business,
     this.vendor,
   });
 }
 
+@immutable
+class GetApplicationByIdApplicationShiftOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  GetApplicationByIdApplicationShiftOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final GetApplicationByIdApplicationShiftOrderTeamHub otherTyped = other as GetApplicationByIdApplicationShiftOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  GetApplicationByIdApplicationShiftOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
+  });
+}
+
 @immutable
 class GetApplicationByIdApplicationShiftOrderBusiness {
   final String id;

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/get_applications_by_shift_id.dart

@@ -198,14 +198,14 @@ class GetApplicationsByShiftIdApplicationsShift {
 class GetApplicationsByShiftIdApplicationsShiftOrder {
   final String id;
   final String? eventName;
-  final String? location;
+  final GetApplicationsByShiftIdApplicationsShiftOrderTeamHub teamHub;
   final GetApplicationsByShiftIdApplicationsShiftOrderBusiness business;
   final GetApplicationsByShiftIdApplicationsShiftOrderVendor? vendor;
   GetApplicationsByShiftIdApplicationsShiftOrder.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']),
+  teamHub = GetApplicationsByShiftIdApplicationsShiftOrderTeamHub.fromJson(json['teamHub']),
   business = GetApplicationsByShiftIdApplicationsShiftOrderBusiness.fromJson(json['business']),
   vendor = json['vendor'] == null ? null : GetApplicationsByShiftIdApplicationsShiftOrderVendor.fromJson(json['vendor']);
   @override
@@ -220,13 +220,13 @@ class GetApplicationsByShiftIdApplicationsShiftOrder {
     final GetApplicationsByShiftIdApplicationsShiftOrder otherTyped = other as GetApplicationsByShiftIdApplicationsShiftOrder;
     return id == otherTyped.id && 
     eventName == otherTyped.eventName && 
-    location == otherTyped.location && 
+    teamHub == otherTyped.teamHub && 
     business == otherTyped.business && 
     vendor == otherTyped.vendor;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, location.hashCode, business.hashCode, vendor.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, teamHub.hashCode, business.hashCode, vendor.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -235,9 +235,7 @@ class GetApplicationsByShiftIdApplicationsShiftOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (location != null) {
+    json['teamHub'] = teamHub.toJson();
-      json['location'] = nativeToJson<String?>(location);
-    }
     json['business'] = business.toJson();
     if (vendor != null) {
       json['vendor'] = vendor!.toJson();
@@ -248,12 +246,58 @@ class GetApplicationsByShiftIdApplicationsShiftOrder {
   GetApplicationsByShiftIdApplicationsShiftOrder({
     required this.id,
     this.eventName,
-    this.location,
+    required this.teamHub,
     required this.business,
     this.vendor,
   });
 }
 
+@immutable
+class GetApplicationsByShiftIdApplicationsShiftOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  GetApplicationsByShiftIdApplicationsShiftOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final GetApplicationsByShiftIdApplicationsShiftOrderTeamHub otherTyped = other as GetApplicationsByShiftIdApplicationsShiftOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  GetApplicationsByShiftIdApplicationsShiftOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
+  });
+}
+
 @immutable
 class GetApplicationsByShiftIdApplicationsShiftOrderBusiness {
   final String id;

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/get_applications_by_shift_id_and_status.dart

@@ -209,14 +209,14 @@ class GetApplicationsByShiftIdAndStatusApplicationsShift {
 class GetApplicationsByShiftIdAndStatusApplicationsShiftOrder {
   final String id;
   final String? eventName;
-  final String? location;
+  final GetApplicationsByShiftIdAndStatusApplicationsShiftOrderTeamHub teamHub;
   final GetApplicationsByShiftIdAndStatusApplicationsShiftOrderBusiness business;
   final GetApplicationsByShiftIdAndStatusApplicationsShiftOrderVendor? vendor;
   GetApplicationsByShiftIdAndStatusApplicationsShiftOrder.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']),
+  teamHub = GetApplicationsByShiftIdAndStatusApplicationsShiftOrderTeamHub.fromJson(json['teamHub']),
   business = GetApplicationsByShiftIdAndStatusApplicationsShiftOrderBusiness.fromJson(json['business']),
   vendor = json['vendor'] == null ? null : GetApplicationsByShiftIdAndStatusApplicationsShiftOrderVendor.fromJson(json['vendor']);
   @override
@@ -231,13 +231,13 @@ class GetApplicationsByShiftIdAndStatusApplicationsShiftOrder {
     final GetApplicationsByShiftIdAndStatusApplicationsShiftOrder otherTyped = other as GetApplicationsByShiftIdAndStatusApplicationsShiftOrder;
     return id == otherTyped.id && 
     eventName == otherTyped.eventName && 
-    location == otherTyped.location && 
+    teamHub == otherTyped.teamHub && 
     business == otherTyped.business && 
     vendor == otherTyped.vendor;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, location.hashCode, business.hashCode, vendor.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, teamHub.hashCode, business.hashCode, vendor.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -246,9 +246,7 @@ class GetApplicationsByShiftIdAndStatusApplicationsShiftOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (location != null) {
+    json['teamHub'] = teamHub.toJson();
-      json['location'] = nativeToJson<String?>(location);
-    }
     json['business'] = business.toJson();
     if (vendor != null) {
       json['vendor'] = vendor!.toJson();
@@ -259,12 +257,58 @@ class GetApplicationsByShiftIdAndStatusApplicationsShiftOrder {
   GetApplicationsByShiftIdAndStatusApplicationsShiftOrder({
     required this.id,
     this.eventName,
-    this.location,
+    required this.teamHub,
     required this.business,
     this.vendor,
   });
 }
 
+@immutable
+class GetApplicationsByShiftIdAndStatusApplicationsShiftOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  GetApplicationsByShiftIdAndStatusApplicationsShiftOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final GetApplicationsByShiftIdAndStatusApplicationsShiftOrderTeamHub otherTyped = other as GetApplicationsByShiftIdAndStatusApplicationsShiftOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  GetApplicationsByShiftIdAndStatusApplicationsShiftOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
+  });
+}
+
 @immutable
 class GetApplicationsByShiftIdAndStatusApplicationsShiftOrderBusiness {
   final String id;

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/get_applications_by_staff_id.dart

@@ -208,14 +208,14 @@ class GetApplicationsByStaffIdApplicationsShift {
 class GetApplicationsByStaffIdApplicationsShiftOrder {
   final String id;
   final String? eventName;
-  final String? location;
+  final GetApplicationsByStaffIdApplicationsShiftOrderTeamHub teamHub;
   final GetApplicationsByStaffIdApplicationsShiftOrderBusiness business;
   final GetApplicationsByStaffIdApplicationsShiftOrderVendor? vendor;
   GetApplicationsByStaffIdApplicationsShiftOrder.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']),
+  teamHub = GetApplicationsByStaffIdApplicationsShiftOrderTeamHub.fromJson(json['teamHub']),
   business = GetApplicationsByStaffIdApplicationsShiftOrderBusiness.fromJson(json['business']),
   vendor = json['vendor'] == null ? null : GetApplicationsByStaffIdApplicationsShiftOrderVendor.fromJson(json['vendor']);
   @override
@@ -230,13 +230,13 @@ class GetApplicationsByStaffIdApplicationsShiftOrder {
     final GetApplicationsByStaffIdApplicationsShiftOrder otherTyped = other as GetApplicationsByStaffIdApplicationsShiftOrder;
     return id == otherTyped.id && 
     eventName == otherTyped.eventName && 
-    location == otherTyped.location && 
+    teamHub == otherTyped.teamHub && 
     business == otherTyped.business && 
     vendor == otherTyped.vendor;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, location.hashCode, business.hashCode, vendor.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, teamHub.hashCode, business.hashCode, vendor.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -245,9 +245,7 @@ class GetApplicationsByStaffIdApplicationsShiftOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (location != null) {
+    json['teamHub'] = teamHub.toJson();
-      json['location'] = nativeToJson<String?>(location);
-    }
     json['business'] = business.toJson();
     if (vendor != null) {
       json['vendor'] = vendor!.toJson();
@@ -258,12 +256,58 @@ class GetApplicationsByStaffIdApplicationsShiftOrder {
   GetApplicationsByStaffIdApplicationsShiftOrder({
     required this.id,
     this.eventName,
-    this.location,
+    required this.teamHub,
     required this.business,
     this.vendor,
   });
 }
 
+@immutable
+class GetApplicationsByStaffIdApplicationsShiftOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  GetApplicationsByStaffIdApplicationsShiftOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final GetApplicationsByStaffIdApplicationsShiftOrderTeamHub otherTyped = other as GetApplicationsByStaffIdApplicationsShiftOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  GetApplicationsByStaffIdApplicationsShiftOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
+  });
+}
+
 @immutable
 class GetApplicationsByStaffIdApplicationsShiftOrderBusiness {
   final String id;

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/get_invoice_by_id.dart

@@ -321,15 +321,15 @@ class GetInvoiceByIdInvoiceBusiness {
 @immutable
 class GetInvoiceByIdInvoiceOrder {
   final String? eventName;
-  final String? hub;
   final String? deparment;
   final String? poReference;
+  final GetInvoiceByIdInvoiceOrderTeamHub teamHub;
   GetInvoiceByIdInvoiceOrder.fromJson(dynamic json):
   
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  hub = json['hub'] == null ? null : nativeFromJson<String>(json['hub']),
   deparment = json['deparment'] == null ? null : nativeFromJson<String>(json['deparment']),
-  poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']);
+  poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']),
+  teamHub = GetInvoiceByIdInvoiceOrderTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -341,13 +341,13 @@ class GetInvoiceByIdInvoiceOrder {
 
     final GetInvoiceByIdInvoiceOrder otherTyped = other as GetInvoiceByIdInvoiceOrder;
     return eventName == otherTyped.eventName && 
-    hub == otherTyped.hub && 
     deparment == otherTyped.deparment && 
-    poReference == otherTyped.poReference;
+    poReference == otherTyped.poReference && 
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([eventName.hashCode, hub.hashCode, deparment.hashCode, poReference.hashCode]);
+  int get hashCode => Object.hashAll([eventName.hashCode, deparment.hashCode, poReference.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -355,23 +355,67 @@ class GetInvoiceByIdInvoiceOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (hub != null) {
-      json['hub'] = nativeToJson<String?>(hub);
-    }
     if (deparment != null) {
       json['deparment'] = nativeToJson<String?>(deparment);
     }
     if (poReference != null) {
       json['poReference'] = nativeToJson<String?>(poReference);
     }
+    json['teamHub'] = teamHub.toJson();
     return json;
   }
 
   GetInvoiceByIdInvoiceOrder({
     this.eventName,
-    this.hub,
     this.deparment,
     this.poReference,
+    required this.teamHub,
+  });
+}
+
+@immutable
+class GetInvoiceByIdInvoiceOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  GetInvoiceByIdInvoiceOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final GetInvoiceByIdInvoiceOrderTeamHub otherTyped = other as GetInvoiceByIdInvoiceOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  GetInvoiceByIdInvoiceOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/get_order_by_id.dart

@@ -24,7 +24,6 @@ class GetOrderByIdOrder {
   final String? vendorId;
   final String businessId;
   final EnumValue<OrderType> orderType;
-  final String? location;
   final EnumValue<OrderStatus> status;
   final Timestamp? date;
   final Timestamp? startDate;
@@ -35,7 +34,6 @@ class GetOrderByIdOrder {
   final AnyValue? assignedStaff;
   final AnyValue? shifts;
   final int? requested;
-  final String? hub;
   final AnyValue? recurringDays;
   final AnyValue? permanentDays;
   final String? poReference;
@@ -44,6 +42,7 @@ class GetOrderByIdOrder {
   final Timestamp? createdAt;
   final GetOrderByIdOrderBusiness business;
   final GetOrderByIdOrderVendor? vendor;
+  final GetOrderByIdOrderTeamHub teamHub;
   GetOrderByIdOrder.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
@@ -51,7 +50,6 @@ class GetOrderByIdOrder {
   vendorId = json['vendorId'] == null ? null : nativeFromJson<String>(json['vendorId']),
   businessId = nativeFromJson<String>(json['businessId']),
   orderType = orderTypeDeserializer(json['orderType']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']),
   status = orderStatusDeserializer(json['status']),
   date = json['date'] == null ? null : Timestamp.fromJson(json['date']),
   startDate = json['startDate'] == null ? null : Timestamp.fromJson(json['startDate']),
@@ -62,7 +60,6 @@ class GetOrderByIdOrder {
   assignedStaff = json['assignedStaff'] == null ? null : AnyValue.fromJson(json['assignedStaff']),
   shifts = json['shifts'] == null ? null : AnyValue.fromJson(json['shifts']),
   requested = json['requested'] == null ? null : nativeFromJson<int>(json['requested']),
-  hub = json['hub'] == null ? null : nativeFromJson<String>(json['hub']),
   recurringDays = json['recurringDays'] == null ? null : AnyValue.fromJson(json['recurringDays']),
   permanentDays = json['permanentDays'] == null ? null : AnyValue.fromJson(json['permanentDays']),
   poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']),
@@ -70,7 +67,8 @@ class GetOrderByIdOrder {
   notes = json['notes'] == null ? null : nativeFromJson<String>(json['notes']),
   createdAt = json['createdAt'] == null ? null : Timestamp.fromJson(json['createdAt']),
   business = GetOrderByIdOrderBusiness.fromJson(json['business']),
-  vendor = json['vendor'] == null ? null : GetOrderByIdOrderVendor.fromJson(json['vendor']);
+  vendor = json['vendor'] == null ? null : GetOrderByIdOrderVendor.fromJson(json['vendor']),
+  teamHub = GetOrderByIdOrderTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -86,7 +84,6 @@ class GetOrderByIdOrder {
     vendorId == otherTyped.vendorId && 
     businessId == otherTyped.businessId && 
     orderType == otherTyped.orderType && 
-    location == otherTyped.location && 
     status == otherTyped.status && 
     date == otherTyped.date && 
     startDate == otherTyped.startDate && 
@@ -97,7 +94,6 @@ class GetOrderByIdOrder {
     assignedStaff == otherTyped.assignedStaff && 
     shifts == otherTyped.shifts && 
     requested == otherTyped.requested && 
-    hub == otherTyped.hub && 
     recurringDays == otherTyped.recurringDays && 
     permanentDays == otherTyped.permanentDays && 
     poReference == otherTyped.poReference && 
@@ -105,11 +101,12 @@ class GetOrderByIdOrder {
     notes == otherTyped.notes && 
     createdAt == otherTyped.createdAt && 
     business == otherTyped.business && 
-    vendor == otherTyped.vendor;
+    vendor == otherTyped.vendor && 
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, vendorId.hashCode, businessId.hashCode, orderType.hashCode, location.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, duration.hashCode, lunchBreak.hashCode, total.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, hub.hashCode, recurringDays.hashCode, permanentDays.hashCode, poReference.hashCode, detectedConflicts.hashCode, notes.hashCode, createdAt.hashCode, business.hashCode, vendor.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, vendorId.hashCode, businessId.hashCode, orderType.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, duration.hashCode, lunchBreak.hashCode, total.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, recurringDays.hashCode, permanentDays.hashCode, poReference.hashCode, detectedConflicts.hashCode, notes.hashCode, createdAt.hashCode, business.hashCode, vendor.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -125,9 +122,6 @@ class GetOrderByIdOrder {
     json['orderType'] = 
     orderTypeSerializer(orderType)
     ;
-    if (location != null) {
-      json['location'] = nativeToJson<String?>(location);
-    }
     json['status'] = 
     orderStatusSerializer(status)
     ;
@@ -160,9 +154,6 @@ class GetOrderByIdOrder {
     if (requested != null) {
       json['requested'] = nativeToJson<int?>(requested);
     }
-    if (hub != null) {
-      json['hub'] = nativeToJson<String?>(hub);
-    }
     if (recurringDays != null) {
       json['recurringDays'] = recurringDays!.toJson();
     }
@@ -185,6 +176,7 @@ class GetOrderByIdOrder {
     if (vendor != null) {
       json['vendor'] = vendor!.toJson();
     }
+    json['teamHub'] = teamHub.toJson();
     return json;
   }
 
@@ -194,7 +186,6 @@ class GetOrderByIdOrder {
     this.vendorId,
     required this.businessId,
     required this.orderType,
-    this.location,
     required this.status,
     this.date,
     this.startDate,
@@ -205,7 +196,6 @@ class GetOrderByIdOrder {
     this.assignedStaff,
     this.shifts,
     this.requested,
-    this.hub,
     this.recurringDays,
     this.permanentDays,
     this.poReference,
@@ -214,6 +204,7 @@ class GetOrderByIdOrder {
     this.createdAt,
     required this.business,
     this.vendor,
+    required this.teamHub,
   });
 }
 
@@ -309,6 +300,52 @@ class GetOrderByIdOrderVendor {
   });
 }
 
+@immutable
+class GetOrderByIdOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  GetOrderByIdOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final GetOrderByIdOrderTeamHub otherTyped = other as GetOrderByIdOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  GetOrderByIdOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
+  });
+}
+
 @immutable
 class GetOrderByIdData {
   final GetOrderByIdOrder? order;

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/get_orders_by_business_id.dart

@@ -34,7 +34,6 @@ class GetOrdersByBusinessIdOrders {
   final String? vendorId;
   final String businessId;
   final EnumValue<OrderType> orderType;
-  final String? location;
   final EnumValue<OrderStatus> status;
   final Timestamp? date;
   final Timestamp? startDate;
@@ -45,7 +44,6 @@ class GetOrdersByBusinessIdOrders {
   final AnyValue? assignedStaff;
   final AnyValue? shifts;
   final int? requested;
-  final String? hub;
   final AnyValue? recurringDays;
   final AnyValue? permanentDays;
   final String? poReference;
@@ -54,6 +52,7 @@ class GetOrdersByBusinessIdOrders {
   final Timestamp? createdAt;
   final GetOrdersByBusinessIdOrdersBusiness business;
   final GetOrdersByBusinessIdOrdersVendor? vendor;
+  final GetOrdersByBusinessIdOrdersTeamHub teamHub;
   GetOrdersByBusinessIdOrders.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
@@ -61,7 +60,6 @@ class GetOrdersByBusinessIdOrders {
   vendorId = json['vendorId'] == null ? null : nativeFromJson<String>(json['vendorId']),
   businessId = nativeFromJson<String>(json['businessId']),
   orderType = orderTypeDeserializer(json['orderType']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']),
   status = orderStatusDeserializer(json['status']),
   date = json['date'] == null ? null : Timestamp.fromJson(json['date']),
   startDate = json['startDate'] == null ? null : Timestamp.fromJson(json['startDate']),
@@ -72,7 +70,6 @@ class GetOrdersByBusinessIdOrders {
   assignedStaff = json['assignedStaff'] == null ? null : AnyValue.fromJson(json['assignedStaff']),
   shifts = json['shifts'] == null ? null : AnyValue.fromJson(json['shifts']),
   requested = json['requested'] == null ? null : nativeFromJson<int>(json['requested']),
-  hub = json['hub'] == null ? null : nativeFromJson<String>(json['hub']),
   recurringDays = json['recurringDays'] == null ? null : AnyValue.fromJson(json['recurringDays']),
   permanentDays = json['permanentDays'] == null ? null : AnyValue.fromJson(json['permanentDays']),
   poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']),
@@ -80,7 +77,8 @@ class GetOrdersByBusinessIdOrders {
   notes = json['notes'] == null ? null : nativeFromJson<String>(json['notes']),
   createdAt = json['createdAt'] == null ? null : Timestamp.fromJson(json['createdAt']),
   business = GetOrdersByBusinessIdOrdersBusiness.fromJson(json['business']),
-  vendor = json['vendor'] == null ? null : GetOrdersByBusinessIdOrdersVendor.fromJson(json['vendor']);
+  vendor = json['vendor'] == null ? null : GetOrdersByBusinessIdOrdersVendor.fromJson(json['vendor']),
+  teamHub = GetOrdersByBusinessIdOrdersTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -96,7 +94,6 @@ class GetOrdersByBusinessIdOrders {
     vendorId == otherTyped.vendorId && 
     businessId == otherTyped.businessId && 
     orderType == otherTyped.orderType && 
-    location == otherTyped.location && 
     status == otherTyped.status && 
     date == otherTyped.date && 
     startDate == otherTyped.startDate && 
@@ -107,7 +104,6 @@ class GetOrdersByBusinessIdOrders {
     assignedStaff == otherTyped.assignedStaff && 
     shifts == otherTyped.shifts && 
     requested == otherTyped.requested && 
-    hub == otherTyped.hub && 
     recurringDays == otherTyped.recurringDays && 
     permanentDays == otherTyped.permanentDays && 
     poReference == otherTyped.poReference && 
@@ -115,11 +111,12 @@ class GetOrdersByBusinessIdOrders {
     notes == otherTyped.notes && 
     createdAt == otherTyped.createdAt && 
     business == otherTyped.business && 
-    vendor == otherTyped.vendor;
+    vendor == otherTyped.vendor && 
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, vendorId.hashCode, businessId.hashCode, orderType.hashCode, location.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, duration.hashCode, lunchBreak.hashCode, total.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, hub.hashCode, recurringDays.hashCode, permanentDays.hashCode, poReference.hashCode, detectedConflicts.hashCode, notes.hashCode, createdAt.hashCode, business.hashCode, vendor.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, vendorId.hashCode, businessId.hashCode, orderType.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, duration.hashCode, lunchBreak.hashCode, total.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, recurringDays.hashCode, permanentDays.hashCode, poReference.hashCode, detectedConflicts.hashCode, notes.hashCode, createdAt.hashCode, business.hashCode, vendor.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -135,9 +132,6 @@ class GetOrdersByBusinessIdOrders {
     json['orderType'] = 
     orderTypeSerializer(orderType)
     ;
-    if (location != null) {
-      json['location'] = nativeToJson<String?>(location);
-    }
     json['status'] = 
     orderStatusSerializer(status)
     ;
@@ -170,9 +164,6 @@ class GetOrdersByBusinessIdOrders {
     if (requested != null) {
       json['requested'] = nativeToJson<int?>(requested);
     }
-    if (hub != null) {
-      json['hub'] = nativeToJson<String?>(hub);
-    }
     if (recurringDays != null) {
       json['recurringDays'] = recurringDays!.toJson();
     }
@@ -195,6 +186,7 @@ class GetOrdersByBusinessIdOrders {
     if (vendor != null) {
       json['vendor'] = vendor!.toJson();
     }
+    json['teamHub'] = teamHub.toJson();
     return json;
   }
 
@@ -204,7 +196,6 @@ class GetOrdersByBusinessIdOrders {
     this.vendorId,
     required this.businessId,
     required this.orderType,
-    this.location,
     required this.status,
     this.date,
     this.startDate,
@@ -215,7 +206,6 @@ class GetOrdersByBusinessIdOrders {
     this.assignedStaff,
     this.shifts,
     this.requested,
-    this.hub,
     this.recurringDays,
     this.permanentDays,
     this.poReference,
@@ -224,6 +214,7 @@ class GetOrdersByBusinessIdOrders {
     this.createdAt,
     required this.business,
     this.vendor,
+    required this.teamHub,
   });
 }
 
@@ -319,6 +310,52 @@ class GetOrdersByBusinessIdOrdersVendor {
   });
 }
 
+@immutable
+class GetOrdersByBusinessIdOrdersTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  GetOrdersByBusinessIdOrdersTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final GetOrdersByBusinessIdOrdersTeamHub otherTyped = other as GetOrdersByBusinessIdOrdersTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  GetOrdersByBusinessIdOrdersTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
+  });
+}
+
 @immutable
 class GetOrdersByBusinessIdData {
   final List<GetOrdersByBusinessIdOrders> orders;

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/get_orders_by_date_range.dart

@@ -35,7 +35,6 @@ class GetOrdersByDateRangeOrders {
   final String? vendorId;
   final String businessId;
   final EnumValue<OrderType> orderType;
-  final String? location;
   final EnumValue<OrderStatus> status;
   final Timestamp? date;
   final Timestamp? startDate;
@@ -46,7 +45,6 @@ class GetOrdersByDateRangeOrders {
   final AnyValue? assignedStaff;
   final AnyValue? shifts;
   final int? requested;
-  final String? hub;
   final AnyValue? recurringDays;
   final AnyValue? permanentDays;
   final String? poReference;
@@ -55,6 +53,7 @@ class GetOrdersByDateRangeOrders {
   final Timestamp? createdAt;
   final GetOrdersByDateRangeOrdersBusiness business;
   final GetOrdersByDateRangeOrdersVendor? vendor;
+  final GetOrdersByDateRangeOrdersTeamHub teamHub;
   GetOrdersByDateRangeOrders.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
@@ -62,7 +61,6 @@ class GetOrdersByDateRangeOrders {
   vendorId = json['vendorId'] == null ? null : nativeFromJson<String>(json['vendorId']),
   businessId = nativeFromJson<String>(json['businessId']),
   orderType = orderTypeDeserializer(json['orderType']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']),
   status = orderStatusDeserializer(json['status']),
   date = json['date'] == null ? null : Timestamp.fromJson(json['date']),
   startDate = json['startDate'] == null ? null : Timestamp.fromJson(json['startDate']),
@@ -73,7 +71,6 @@ class GetOrdersByDateRangeOrders {
   assignedStaff = json['assignedStaff'] == null ? null : AnyValue.fromJson(json['assignedStaff']),
   shifts = json['shifts'] == null ? null : AnyValue.fromJson(json['shifts']),
   requested = json['requested'] == null ? null : nativeFromJson<int>(json['requested']),
-  hub = json['hub'] == null ? null : nativeFromJson<String>(json['hub']),
   recurringDays = json['recurringDays'] == null ? null : AnyValue.fromJson(json['recurringDays']),
   permanentDays = json['permanentDays'] == null ? null : AnyValue.fromJson(json['permanentDays']),
   poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']),
@@ -81,7 +78,8 @@ class GetOrdersByDateRangeOrders {
   notes = json['notes'] == null ? null : nativeFromJson<String>(json['notes']),
   createdAt = json['createdAt'] == null ? null : Timestamp.fromJson(json['createdAt']),
   business = GetOrdersByDateRangeOrdersBusiness.fromJson(json['business']),
-  vendor = json['vendor'] == null ? null : GetOrdersByDateRangeOrdersVendor.fromJson(json['vendor']);
+  vendor = json['vendor'] == null ? null : GetOrdersByDateRangeOrdersVendor.fromJson(json['vendor']),
+  teamHub = GetOrdersByDateRangeOrdersTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -97,7 +95,6 @@ class GetOrdersByDateRangeOrders {
     vendorId == otherTyped.vendorId && 
     businessId == otherTyped.businessId && 
     orderType == otherTyped.orderType && 
-    location == otherTyped.location && 
     status == otherTyped.status && 
     date == otherTyped.date && 
     startDate == otherTyped.startDate && 
@@ -108,7 +105,6 @@ class GetOrdersByDateRangeOrders {
     assignedStaff == otherTyped.assignedStaff && 
     shifts == otherTyped.shifts && 
     requested == otherTyped.requested && 
-    hub == otherTyped.hub && 
     recurringDays == otherTyped.recurringDays && 
     permanentDays == otherTyped.permanentDays && 
     poReference == otherTyped.poReference && 
@@ -116,11 +112,12 @@ class GetOrdersByDateRangeOrders {
     notes == otherTyped.notes && 
     createdAt == otherTyped.createdAt && 
     business == otherTyped.business && 
-    vendor == otherTyped.vendor;
+    vendor == otherTyped.vendor && 
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, vendorId.hashCode, businessId.hashCode, orderType.hashCode, location.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, duration.hashCode, lunchBreak.hashCode, total.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, hub.hashCode, recurringDays.hashCode, permanentDays.hashCode, poReference.hashCode, detectedConflicts.hashCode, notes.hashCode, createdAt.hashCode, business.hashCode, vendor.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, vendorId.hashCode, businessId.hashCode, orderType.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, duration.hashCode, lunchBreak.hashCode, total.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, recurringDays.hashCode, permanentDays.hashCode, poReference.hashCode, detectedConflicts.hashCode, notes.hashCode, createdAt.hashCode, business.hashCode, vendor.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -136,9 +133,6 @@ class GetOrdersByDateRangeOrders {
     json['orderType'] = 
     orderTypeSerializer(orderType)
     ;
-    if (location != null) {
-      json['location'] = nativeToJson<String?>(location);
-    }
     json['status'] = 
     orderStatusSerializer(status)
     ;
@@ -171,9 +165,6 @@ class GetOrdersByDateRangeOrders {
     if (requested != null) {
       json['requested'] = nativeToJson<int?>(requested);
     }
-    if (hub != null) {
-      json['hub'] = nativeToJson<String?>(hub);
-    }
     if (recurringDays != null) {
       json['recurringDays'] = recurringDays!.toJson();
     }
@@ -196,6 +187,7 @@ class GetOrdersByDateRangeOrders {
     if (vendor != null) {
       json['vendor'] = vendor!.toJson();
     }
+    json['teamHub'] = teamHub.toJson();
     return json;
   }
 
@@ -205,7 +197,6 @@ class GetOrdersByDateRangeOrders {
     this.vendorId,
     required this.businessId,
     required this.orderType,
-    this.location,
     required this.status,
     this.date,
     this.startDate,
@@ -216,7 +207,6 @@ class GetOrdersByDateRangeOrders {
     this.assignedStaff,
     this.shifts,
     this.requested,
-    this.hub,
     this.recurringDays,
     this.permanentDays,
     this.poReference,
@@ -225,6 +215,7 @@ class GetOrdersByDateRangeOrders {
     this.createdAt,
     required this.business,
     this.vendor,
+    required this.teamHub,
   });
 }
 
@@ -320,6 +311,52 @@ class GetOrdersByDateRangeOrdersVendor {
   });
 }
 
+@immutable
+class GetOrdersByDateRangeOrdersTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  GetOrdersByDateRangeOrdersTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final GetOrdersByDateRangeOrdersTeamHub otherTyped = other as GetOrdersByDateRangeOrdersTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  GetOrdersByDateRangeOrdersTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
+  });
+}
+
 @immutable
 class GetOrdersByDateRangeData {
   final List<GetOrdersByDateRangeOrders> orders;

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/get_orders_by_status.dart

@@ -34,7 +34,6 @@ class GetOrdersByStatusOrders {
   final String? vendorId;
   final String businessId;
   final EnumValue<OrderType> orderType;
-  final String? location;
   final EnumValue<OrderStatus> status;
   final Timestamp? date;
   final Timestamp? startDate;
@@ -45,7 +44,6 @@ class GetOrdersByStatusOrders {
   final AnyValue? assignedStaff;
   final AnyValue? shifts;
   final int? requested;
-  final String? hub;
   final AnyValue? recurringDays;
   final AnyValue? permanentDays;
   final String? poReference;
@@ -54,6 +52,7 @@ class GetOrdersByStatusOrders {
   final Timestamp? createdAt;
   final GetOrdersByStatusOrdersBusiness business;
   final GetOrdersByStatusOrdersVendor? vendor;
+  final GetOrdersByStatusOrdersTeamHub teamHub;
   GetOrdersByStatusOrders.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
@@ -61,7 +60,6 @@ class GetOrdersByStatusOrders {
   vendorId = json['vendorId'] == null ? null : nativeFromJson<String>(json['vendorId']),
   businessId = nativeFromJson<String>(json['businessId']),
   orderType = orderTypeDeserializer(json['orderType']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']),
   status = orderStatusDeserializer(json['status']),
   date = json['date'] == null ? null : Timestamp.fromJson(json['date']),
   startDate = json['startDate'] == null ? null : Timestamp.fromJson(json['startDate']),
@@ -72,7 +70,6 @@ class GetOrdersByStatusOrders {
   assignedStaff = json['assignedStaff'] == null ? null : AnyValue.fromJson(json['assignedStaff']),
   shifts = json['shifts'] == null ? null : AnyValue.fromJson(json['shifts']),
   requested = json['requested'] == null ? null : nativeFromJson<int>(json['requested']),
-  hub = json['hub'] == null ? null : nativeFromJson<String>(json['hub']),
   recurringDays = json['recurringDays'] == null ? null : AnyValue.fromJson(json['recurringDays']),
   permanentDays = json['permanentDays'] == null ? null : AnyValue.fromJson(json['permanentDays']),
   poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']),
@@ -80,7 +77,8 @@ class GetOrdersByStatusOrders {
   notes = json['notes'] == null ? null : nativeFromJson<String>(json['notes']),
   createdAt = json['createdAt'] == null ? null : Timestamp.fromJson(json['createdAt']),
   business = GetOrdersByStatusOrdersBusiness.fromJson(json['business']),
-  vendor = json['vendor'] == null ? null : GetOrdersByStatusOrdersVendor.fromJson(json['vendor']);
+  vendor = json['vendor'] == null ? null : GetOrdersByStatusOrdersVendor.fromJson(json['vendor']),
+  teamHub = GetOrdersByStatusOrdersTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -96,7 +94,6 @@ class GetOrdersByStatusOrders {
     vendorId == otherTyped.vendorId && 
     businessId == otherTyped.businessId && 
     orderType == otherTyped.orderType && 
-    location == otherTyped.location && 
     status == otherTyped.status && 
     date == otherTyped.date && 
     startDate == otherTyped.startDate && 
@@ -107,7 +104,6 @@ class GetOrdersByStatusOrders {
     assignedStaff == otherTyped.assignedStaff && 
     shifts == otherTyped.shifts && 
     requested == otherTyped.requested && 
-    hub == otherTyped.hub && 
     recurringDays == otherTyped.recurringDays && 
     permanentDays == otherTyped.permanentDays && 
     poReference == otherTyped.poReference && 
@@ -115,11 +111,12 @@ class GetOrdersByStatusOrders {
     notes == otherTyped.notes && 
     createdAt == otherTyped.createdAt && 
     business == otherTyped.business && 
-    vendor == otherTyped.vendor;
+    vendor == otherTyped.vendor && 
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, vendorId.hashCode, businessId.hashCode, orderType.hashCode, location.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, duration.hashCode, lunchBreak.hashCode, total.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, hub.hashCode, recurringDays.hashCode, permanentDays.hashCode, poReference.hashCode, detectedConflicts.hashCode, notes.hashCode, createdAt.hashCode, business.hashCode, vendor.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, vendorId.hashCode, businessId.hashCode, orderType.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, duration.hashCode, lunchBreak.hashCode, total.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, recurringDays.hashCode, permanentDays.hashCode, poReference.hashCode, detectedConflicts.hashCode, notes.hashCode, createdAt.hashCode, business.hashCode, vendor.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -135,9 +132,6 @@ class GetOrdersByStatusOrders {
     json['orderType'] = 
     orderTypeSerializer(orderType)
     ;
-    if (location != null) {
-      json['location'] = nativeToJson<String?>(location);
-    }
     json['status'] = 
     orderStatusSerializer(status)
     ;
@@ -170,9 +164,6 @@ class GetOrdersByStatusOrders {
     if (requested != null) {
       json['requested'] = nativeToJson<int?>(requested);
     }
-    if (hub != null) {
-      json['hub'] = nativeToJson<String?>(hub);
-    }
     if (recurringDays != null) {
       json['recurringDays'] = recurringDays!.toJson();
     }
@@ -195,6 +186,7 @@ class GetOrdersByStatusOrders {
     if (vendor != null) {
       json['vendor'] = vendor!.toJson();
     }
+    json['teamHub'] = teamHub.toJson();
     return json;
   }
 
@@ -204,7 +196,6 @@ class GetOrdersByStatusOrders {
     this.vendorId,
     required this.businessId,
     required this.orderType,
-    this.location,
     required this.status,
     this.date,
     this.startDate,
@@ -215,7 +206,6 @@ class GetOrdersByStatusOrders {
     this.assignedStaff,
     this.shifts,
     this.requested,
-    this.hub,
     this.recurringDays,
     this.permanentDays,
     this.poReference,
@@ -224,6 +214,7 @@ class GetOrdersByStatusOrders {
     this.createdAt,
     required this.business,
     this.vendor,
+    required this.teamHub,
   });
 }
 
@@ -319,6 +310,52 @@ class GetOrdersByStatusOrdersVendor {
   });
 }
 
+@immutable
+class GetOrdersByStatusOrdersTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  GetOrdersByStatusOrdersTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final GetOrdersByStatusOrdersTeamHub otherTyped = other as GetOrdersByStatusOrdersTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  GetOrdersByStatusOrdersTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
+  });
+}
+
 @immutable
 class GetOrdersByStatusData {
   final List<GetOrdersByStatusOrders> orders;

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/get_orders_by_vendor_id.dart

@@ -34,7 +34,6 @@ class GetOrdersByVendorIdOrders {
   final String? vendorId;
   final String businessId;
   final EnumValue<OrderType> orderType;
-  final String? location;
   final EnumValue<OrderStatus> status;
   final Timestamp? date;
   final Timestamp? startDate;
@@ -45,7 +44,6 @@ class GetOrdersByVendorIdOrders {
   final AnyValue? assignedStaff;
   final AnyValue? shifts;
   final int? requested;
-  final String? hub;
   final AnyValue? recurringDays;
   final AnyValue? permanentDays;
   final String? poReference;
@@ -54,6 +52,7 @@ class GetOrdersByVendorIdOrders {
   final Timestamp? createdAt;
   final GetOrdersByVendorIdOrdersBusiness business;
   final GetOrdersByVendorIdOrdersVendor? vendor;
+  final GetOrdersByVendorIdOrdersTeamHub teamHub;
   GetOrdersByVendorIdOrders.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
@@ -61,7 +60,6 @@ class GetOrdersByVendorIdOrders {
   vendorId = json['vendorId'] == null ? null : nativeFromJson<String>(json['vendorId']),
   businessId = nativeFromJson<String>(json['businessId']),
   orderType = orderTypeDeserializer(json['orderType']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']),
   status = orderStatusDeserializer(json['status']),
   date = json['date'] == null ? null : Timestamp.fromJson(json['date']),
   startDate = json['startDate'] == null ? null : Timestamp.fromJson(json['startDate']),
@@ -72,7 +70,6 @@ class GetOrdersByVendorIdOrders {
   assignedStaff = json['assignedStaff'] == null ? null : AnyValue.fromJson(json['assignedStaff']),
   shifts = json['shifts'] == null ? null : AnyValue.fromJson(json['shifts']),
   requested = json['requested'] == null ? null : nativeFromJson<int>(json['requested']),
-  hub = json['hub'] == null ? null : nativeFromJson<String>(json['hub']),
   recurringDays = json['recurringDays'] == null ? null : AnyValue.fromJson(json['recurringDays']),
   permanentDays = json['permanentDays'] == null ? null : AnyValue.fromJson(json['permanentDays']),
   poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']),
@@ -80,7 +77,8 @@ class GetOrdersByVendorIdOrders {
   notes = json['notes'] == null ? null : nativeFromJson<String>(json['notes']),
   createdAt = json['createdAt'] == null ? null : Timestamp.fromJson(json['createdAt']),
   business = GetOrdersByVendorIdOrdersBusiness.fromJson(json['business']),
-  vendor = json['vendor'] == null ? null : GetOrdersByVendorIdOrdersVendor.fromJson(json['vendor']);
+  vendor = json['vendor'] == null ? null : GetOrdersByVendorIdOrdersVendor.fromJson(json['vendor']),
+  teamHub = GetOrdersByVendorIdOrdersTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -96,7 +94,6 @@ class GetOrdersByVendorIdOrders {
     vendorId == otherTyped.vendorId && 
     businessId == otherTyped.businessId && 
     orderType == otherTyped.orderType && 
-    location == otherTyped.location && 
     status == otherTyped.status && 
     date == otherTyped.date && 
     startDate == otherTyped.startDate && 
@@ -107,7 +104,6 @@ class GetOrdersByVendorIdOrders {
     assignedStaff == otherTyped.assignedStaff && 
     shifts == otherTyped.shifts && 
     requested == otherTyped.requested && 
-    hub == otherTyped.hub && 
     recurringDays == otherTyped.recurringDays && 
     permanentDays == otherTyped.permanentDays && 
     poReference == otherTyped.poReference && 
@@ -115,11 +111,12 @@ class GetOrdersByVendorIdOrders {
     notes == otherTyped.notes && 
     createdAt == otherTyped.createdAt && 
     business == otherTyped.business && 
-    vendor == otherTyped.vendor;
+    vendor == otherTyped.vendor && 
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, vendorId.hashCode, businessId.hashCode, orderType.hashCode, location.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, duration.hashCode, lunchBreak.hashCode, total.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, hub.hashCode, recurringDays.hashCode, permanentDays.hashCode, poReference.hashCode, detectedConflicts.hashCode, notes.hashCode, createdAt.hashCode, business.hashCode, vendor.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, vendorId.hashCode, businessId.hashCode, orderType.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, duration.hashCode, lunchBreak.hashCode, total.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, recurringDays.hashCode, permanentDays.hashCode, poReference.hashCode, detectedConflicts.hashCode, notes.hashCode, createdAt.hashCode, business.hashCode, vendor.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -135,9 +132,6 @@ class GetOrdersByVendorIdOrders {
     json['orderType'] = 
     orderTypeSerializer(orderType)
     ;
-    if (location != null) {
-      json['location'] = nativeToJson<String?>(location);
-    }
     json['status'] = 
     orderStatusSerializer(status)
     ;
@@ -170,9 +164,6 @@ class GetOrdersByVendorIdOrders {
     if (requested != null) {
       json['requested'] = nativeToJson<int?>(requested);
     }
-    if (hub != null) {
-      json['hub'] = nativeToJson<String?>(hub);
-    }
     if (recurringDays != null) {
       json['recurringDays'] = recurringDays!.toJson();
     }
@@ -195,6 +186,7 @@ class GetOrdersByVendorIdOrders {
     if (vendor != null) {
       json['vendor'] = vendor!.toJson();
     }
+    json['teamHub'] = teamHub.toJson();
     return json;
   }
 
@@ -204,7 +196,6 @@ class GetOrdersByVendorIdOrders {
     this.vendorId,
     required this.businessId,
     required this.orderType,
-    this.location,
     required this.status,
     this.date,
     this.startDate,
@@ -215,7 +206,6 @@ class GetOrdersByVendorIdOrders {
     this.assignedStaff,
     this.shifts,
     this.requested,
-    this.hub,
     this.recurringDays,
     this.permanentDays,
     this.poReference,
@@ -224,6 +214,7 @@ class GetOrdersByVendorIdOrders {
     this.createdAt,
     required this.business,
     this.vendor,
+    required this.teamHub,
   });
 }
 
@@ -319,6 +310,52 @@ class GetOrdersByVendorIdOrdersVendor {
   });
 }
 
+@immutable
+class GetOrdersByVendorIdOrdersTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  GetOrdersByVendorIdOrdersTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final GetOrdersByVendorIdOrdersTeamHub otherTyped = other as GetOrdersByVendorIdOrdersTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  GetOrdersByVendorIdOrdersTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
+  });
+}
+
 @immutable
 class GetOrdersByVendorIdData {
   final List<GetOrdersByVendorIdOrders> orders;

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/get_rapid_orders.dart

@@ -34,7 +34,6 @@ class GetRapidOrdersOrders {
   final String? vendorId;
   final String businessId;
   final EnumValue<OrderType> orderType;
-  final String? location;
   final EnumValue<OrderStatus> status;
   final Timestamp? date;
   final Timestamp? startDate;
@@ -45,7 +44,6 @@ class GetRapidOrdersOrders {
   final AnyValue? assignedStaff;
   final AnyValue? shifts;
   final int? requested;
-  final String? hub;
   final AnyValue? recurringDays;
   final AnyValue? permanentDays;
   final String? poReference;
@@ -54,6 +52,7 @@ class GetRapidOrdersOrders {
   final Timestamp? createdAt;
   final GetRapidOrdersOrdersBusiness business;
   final GetRapidOrdersOrdersVendor? vendor;
+  final GetRapidOrdersOrdersTeamHub teamHub;
   GetRapidOrdersOrders.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
@@ -61,7 +60,6 @@ class GetRapidOrdersOrders {
   vendorId = json['vendorId'] == null ? null : nativeFromJson<String>(json['vendorId']),
   businessId = nativeFromJson<String>(json['businessId']),
   orderType = orderTypeDeserializer(json['orderType']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']),
   status = orderStatusDeserializer(json['status']),
   date = json['date'] == null ? null : Timestamp.fromJson(json['date']),
   startDate = json['startDate'] == null ? null : Timestamp.fromJson(json['startDate']),
@@ -72,7 +70,6 @@ class GetRapidOrdersOrders {
   assignedStaff = json['assignedStaff'] == null ? null : AnyValue.fromJson(json['assignedStaff']),
   shifts = json['shifts'] == null ? null : AnyValue.fromJson(json['shifts']),
   requested = json['requested'] == null ? null : nativeFromJson<int>(json['requested']),
-  hub = json['hub'] == null ? null : nativeFromJson<String>(json['hub']),
   recurringDays = json['recurringDays'] == null ? null : AnyValue.fromJson(json['recurringDays']),
   permanentDays = json['permanentDays'] == null ? null : AnyValue.fromJson(json['permanentDays']),
   poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']),
@@ -80,7 +77,8 @@ class GetRapidOrdersOrders {
   notes = json['notes'] == null ? null : nativeFromJson<String>(json['notes']),
   createdAt = json['createdAt'] == null ? null : Timestamp.fromJson(json['createdAt']),
   business = GetRapidOrdersOrdersBusiness.fromJson(json['business']),
-  vendor = json['vendor'] == null ? null : GetRapidOrdersOrdersVendor.fromJson(json['vendor']);
+  vendor = json['vendor'] == null ? null : GetRapidOrdersOrdersVendor.fromJson(json['vendor']),
+  teamHub = GetRapidOrdersOrdersTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -96,7 +94,6 @@ class GetRapidOrdersOrders {
     vendorId == otherTyped.vendorId && 
     businessId == otherTyped.businessId && 
     orderType == otherTyped.orderType && 
-    location == otherTyped.location && 
     status == otherTyped.status && 
     date == otherTyped.date && 
     startDate == otherTyped.startDate && 
@@ -107,7 +104,6 @@ class GetRapidOrdersOrders {
     assignedStaff == otherTyped.assignedStaff && 
     shifts == otherTyped.shifts && 
     requested == otherTyped.requested && 
-    hub == otherTyped.hub && 
     recurringDays == otherTyped.recurringDays && 
     permanentDays == otherTyped.permanentDays && 
     poReference == otherTyped.poReference && 
@@ -115,11 +111,12 @@ class GetRapidOrdersOrders {
     notes == otherTyped.notes && 
     createdAt == otherTyped.createdAt && 
     business == otherTyped.business && 
-    vendor == otherTyped.vendor;
+    vendor == otherTyped.vendor && 
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, vendorId.hashCode, businessId.hashCode, orderType.hashCode, location.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, duration.hashCode, lunchBreak.hashCode, total.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, hub.hashCode, recurringDays.hashCode, permanentDays.hashCode, poReference.hashCode, detectedConflicts.hashCode, notes.hashCode, createdAt.hashCode, business.hashCode, vendor.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, vendorId.hashCode, businessId.hashCode, orderType.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, duration.hashCode, lunchBreak.hashCode, total.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, recurringDays.hashCode, permanentDays.hashCode, poReference.hashCode, detectedConflicts.hashCode, notes.hashCode, createdAt.hashCode, business.hashCode, vendor.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -135,9 +132,6 @@ class GetRapidOrdersOrders {
     json['orderType'] = 
     orderTypeSerializer(orderType)
     ;
-    if (location != null) {
-      json['location'] = nativeToJson<String?>(location);
-    }
     json['status'] = 
     orderStatusSerializer(status)
     ;
@@ -170,9 +164,6 @@ class GetRapidOrdersOrders {
     if (requested != null) {
       json['requested'] = nativeToJson<int?>(requested);
     }
-    if (hub != null) {
-      json['hub'] = nativeToJson<String?>(hub);
-    }
     if (recurringDays != null) {
       json['recurringDays'] = recurringDays!.toJson();
     }
@@ -195,6 +186,7 @@ class GetRapidOrdersOrders {
     if (vendor != null) {
       json['vendor'] = vendor!.toJson();
     }
+    json['teamHub'] = teamHub.toJson();
     return json;
   }
 
@@ -204,7 +196,6 @@ class GetRapidOrdersOrders {
     this.vendorId,
     required this.businessId,
     required this.orderType,
-    this.location,
     required this.status,
     this.date,
     this.startDate,
@@ -215,7 +206,6 @@ class GetRapidOrdersOrders {
     this.assignedStaff,
     this.shifts,
     this.requested,
-    this.hub,
     this.recurringDays,
     this.permanentDays,
     this.poReference,
@@ -224,6 +214,7 @@ class GetRapidOrdersOrders {
     this.createdAt,
     required this.business,
     this.vendor,
+    required this.teamHub,
   });
 }
 
@@ -319,6 +310,52 @@ class GetRapidOrdersOrdersVendor {
   });
 }
 
+@immutable
+class GetRapidOrdersOrdersTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  GetRapidOrdersOrdersTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final GetRapidOrdersOrdersTeamHub otherTyped = other as GetRapidOrdersOrdersTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  GetRapidOrdersOrdersTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
+  });
+}
+
 @immutable
 class GetRapidOrdersData {
   final List<GetRapidOrdersOrders> orders;

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_applications.dart

@@ -197,14 +197,14 @@ class ListApplicationsApplicationsShift {
 class ListApplicationsApplicationsShiftOrder {
   final String id;
   final String? eventName;
-  final String? location;
+  final ListApplicationsApplicationsShiftOrderTeamHub teamHub;
   final ListApplicationsApplicationsShiftOrderBusiness business;
   final ListApplicationsApplicationsShiftOrderVendor? vendor;
   ListApplicationsApplicationsShiftOrder.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']),
+  teamHub = ListApplicationsApplicationsShiftOrderTeamHub.fromJson(json['teamHub']),
   business = ListApplicationsApplicationsShiftOrderBusiness.fromJson(json['business']),
   vendor = json['vendor'] == null ? null : ListApplicationsApplicationsShiftOrderVendor.fromJson(json['vendor']);
   @override
@@ -219,13 +219,13 @@ class ListApplicationsApplicationsShiftOrder {
     final ListApplicationsApplicationsShiftOrder otherTyped = other as ListApplicationsApplicationsShiftOrder;
     return id == otherTyped.id && 
     eventName == otherTyped.eventName && 
-    location == otherTyped.location && 
+    teamHub == otherTyped.teamHub && 
     business == otherTyped.business && 
     vendor == otherTyped.vendor;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, location.hashCode, business.hashCode, vendor.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, teamHub.hashCode, business.hashCode, vendor.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -234,9 +234,7 @@ class ListApplicationsApplicationsShiftOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (location != null) {
+    json['teamHub'] = teamHub.toJson();
-      json['location'] = nativeToJson<String?>(location);
-    }
     json['business'] = business.toJson();
     if (vendor != null) {
       json['vendor'] = vendor!.toJson();
@@ -247,12 +245,58 @@ class ListApplicationsApplicationsShiftOrder {
   ListApplicationsApplicationsShiftOrder({
     required this.id,
     this.eventName,
-    this.location,
+    required this.teamHub,
     required this.business,
     this.vendor,
   });
 }
 
+@immutable
+class ListApplicationsApplicationsShiftOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  ListApplicationsApplicationsShiftOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListApplicationsApplicationsShiftOrderTeamHub otherTyped = other as ListApplicationsApplicationsShiftOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  ListApplicationsApplicationsShiftOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
+  });
+}
+
 @immutable
 class ListApplicationsApplicationsShiftOrderBusiness {
   final String id;

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_invoices.dart

@@ -331,15 +331,15 @@ class ListInvoicesInvoicesBusiness {
 @immutable
 class ListInvoicesInvoicesOrder {
   final String? eventName;
-  final String? hub;
   final String? deparment;
   final String? poReference;
+  final ListInvoicesInvoicesOrderTeamHub teamHub;
   ListInvoicesInvoicesOrder.fromJson(dynamic json):
   
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  hub = json['hub'] == null ? null : nativeFromJson<String>(json['hub']),
   deparment = json['deparment'] == null ? null : nativeFromJson<String>(json['deparment']),
-  poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']);
+  poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']),
+  teamHub = ListInvoicesInvoicesOrderTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -351,13 +351,13 @@ class ListInvoicesInvoicesOrder {
 
     final ListInvoicesInvoicesOrder otherTyped = other as ListInvoicesInvoicesOrder;
     return eventName == otherTyped.eventName && 
-    hub == otherTyped.hub && 
     deparment == otherTyped.deparment && 
-    poReference == otherTyped.poReference;
+    poReference == otherTyped.poReference && 
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([eventName.hashCode, hub.hashCode, deparment.hashCode, poReference.hashCode]);
+  int get hashCode => Object.hashAll([eventName.hashCode, deparment.hashCode, poReference.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -365,23 +365,67 @@ class ListInvoicesInvoicesOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (hub != null) {
-      json['hub'] = nativeToJson<String?>(hub);
-    }
     if (deparment != null) {
       json['deparment'] = nativeToJson<String?>(deparment);
     }
     if (poReference != null) {
       json['poReference'] = nativeToJson<String?>(poReference);
     }
+    json['teamHub'] = teamHub.toJson();
     return json;
   }
 
   ListInvoicesInvoicesOrder({
     this.eventName,
-    this.hub,
     this.deparment,
     this.poReference,
+    required this.teamHub,
+  });
+}
+
+@immutable
+class ListInvoicesInvoicesOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  ListInvoicesInvoicesOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListInvoicesInvoicesOrderTeamHub otherTyped = other as ListInvoicesInvoicesOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  ListInvoicesInvoicesOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_invoices_by_business_id.dart

@@ -331,15 +331,15 @@ class ListInvoicesByBusinessIdInvoicesBusiness {
 @immutable
 class ListInvoicesByBusinessIdInvoicesOrder {
   final String? eventName;
-  final String? hub;
   final String? deparment;
   final String? poReference;
+  final ListInvoicesByBusinessIdInvoicesOrderTeamHub teamHub;
   ListInvoicesByBusinessIdInvoicesOrder.fromJson(dynamic json):
   
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  hub = json['hub'] == null ? null : nativeFromJson<String>(json['hub']),
   deparment = json['deparment'] == null ? null : nativeFromJson<String>(json['deparment']),
-  poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']);
+  poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']),
+  teamHub = ListInvoicesByBusinessIdInvoicesOrderTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -351,13 +351,13 @@ class ListInvoicesByBusinessIdInvoicesOrder {
 
     final ListInvoicesByBusinessIdInvoicesOrder otherTyped = other as ListInvoicesByBusinessIdInvoicesOrder;
     return eventName == otherTyped.eventName && 
-    hub == otherTyped.hub && 
     deparment == otherTyped.deparment && 
-    poReference == otherTyped.poReference;
+    poReference == otherTyped.poReference && 
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([eventName.hashCode, hub.hashCode, deparment.hashCode, poReference.hashCode]);
+  int get hashCode => Object.hashAll([eventName.hashCode, deparment.hashCode, poReference.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -365,23 +365,67 @@ class ListInvoicesByBusinessIdInvoicesOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (hub != null) {
-      json['hub'] = nativeToJson<String?>(hub);
-    }
     if (deparment != null) {
       json['deparment'] = nativeToJson<String?>(deparment);
     }
     if (poReference != null) {
       json['poReference'] = nativeToJson<String?>(poReference);
     }
+    json['teamHub'] = teamHub.toJson();
     return json;
   }
 
   ListInvoicesByBusinessIdInvoicesOrder({
     this.eventName,
-    this.hub,
     this.deparment,
     this.poReference,
+    required this.teamHub,
+  });
+}
+
+@immutable
+class ListInvoicesByBusinessIdInvoicesOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  ListInvoicesByBusinessIdInvoicesOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListInvoicesByBusinessIdInvoicesOrderTeamHub otherTyped = other as ListInvoicesByBusinessIdInvoicesOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  ListInvoicesByBusinessIdInvoicesOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_invoices_by_order_id.dart

@@ -331,15 +331,15 @@ class ListInvoicesByOrderIdInvoicesBusiness {
 @immutable
 class ListInvoicesByOrderIdInvoicesOrder {
   final String? eventName;
-  final String? hub;
   final String? deparment;
   final String? poReference;
+  final ListInvoicesByOrderIdInvoicesOrderTeamHub teamHub;
   ListInvoicesByOrderIdInvoicesOrder.fromJson(dynamic json):
   
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  hub = json['hub'] == null ? null : nativeFromJson<String>(json['hub']),
   deparment = json['deparment'] == null ? null : nativeFromJson<String>(json['deparment']),
-  poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']);
+  poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']),
+  teamHub = ListInvoicesByOrderIdInvoicesOrderTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -351,13 +351,13 @@ class ListInvoicesByOrderIdInvoicesOrder {
 
     final ListInvoicesByOrderIdInvoicesOrder otherTyped = other as ListInvoicesByOrderIdInvoicesOrder;
     return eventName == otherTyped.eventName && 
-    hub == otherTyped.hub && 
     deparment == otherTyped.deparment && 
-    poReference == otherTyped.poReference;
+    poReference == otherTyped.poReference && 
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([eventName.hashCode, hub.hashCode, deparment.hashCode, poReference.hashCode]);
+  int get hashCode => Object.hashAll([eventName.hashCode, deparment.hashCode, poReference.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -365,23 +365,67 @@ class ListInvoicesByOrderIdInvoicesOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (hub != null) {
-      json['hub'] = nativeToJson<String?>(hub);
-    }
     if (deparment != null) {
       json['deparment'] = nativeToJson<String?>(deparment);
     }
     if (poReference != null) {
       json['poReference'] = nativeToJson<String?>(poReference);
     }
+    json['teamHub'] = teamHub.toJson();
     return json;
   }
 
   ListInvoicesByOrderIdInvoicesOrder({
     this.eventName,
-    this.hub,
     this.deparment,
     this.poReference,
+    required this.teamHub,
+  });
+}
+
+@immutable
+class ListInvoicesByOrderIdInvoicesOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  ListInvoicesByOrderIdInvoicesOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListInvoicesByOrderIdInvoicesOrderTeamHub otherTyped = other as ListInvoicesByOrderIdInvoicesOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  ListInvoicesByOrderIdInvoicesOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_invoices_by_status.dart

@@ -331,15 +331,15 @@ class ListInvoicesByStatusInvoicesBusiness {
 @immutable
 class ListInvoicesByStatusInvoicesOrder {
   final String? eventName;
-  final String? hub;
   final String? deparment;
   final String? poReference;
+  final ListInvoicesByStatusInvoicesOrderTeamHub teamHub;
   ListInvoicesByStatusInvoicesOrder.fromJson(dynamic json):
   
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  hub = json['hub'] == null ? null : nativeFromJson<String>(json['hub']),
   deparment = json['deparment'] == null ? null : nativeFromJson<String>(json['deparment']),
-  poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']);
+  poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']),
+  teamHub = ListInvoicesByStatusInvoicesOrderTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -351,13 +351,13 @@ class ListInvoicesByStatusInvoicesOrder {
 
     final ListInvoicesByStatusInvoicesOrder otherTyped = other as ListInvoicesByStatusInvoicesOrder;
     return eventName == otherTyped.eventName && 
-    hub == otherTyped.hub && 
     deparment == otherTyped.deparment && 
-    poReference == otherTyped.poReference;
+    poReference == otherTyped.poReference && 
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([eventName.hashCode, hub.hashCode, deparment.hashCode, poReference.hashCode]);
+  int get hashCode => Object.hashAll([eventName.hashCode, deparment.hashCode, poReference.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -365,23 +365,67 @@ class ListInvoicesByStatusInvoicesOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (hub != null) {
-      json['hub'] = nativeToJson<String?>(hub);
-    }
     if (deparment != null) {
       json['deparment'] = nativeToJson<String?>(deparment);
     }
     if (poReference != null) {
       json['poReference'] = nativeToJson<String?>(poReference);
     }
+    json['teamHub'] = teamHub.toJson();
     return json;
   }
 
   ListInvoicesByStatusInvoicesOrder({
     this.eventName,
-    this.hub,
     this.deparment,
     this.poReference,
+    required this.teamHub,
+  });
+}
+
+@immutable
+class ListInvoicesByStatusInvoicesOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  ListInvoicesByStatusInvoicesOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListInvoicesByStatusInvoicesOrderTeamHub otherTyped = other as ListInvoicesByStatusInvoicesOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  ListInvoicesByStatusInvoicesOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_invoices_by_vendor_id.dart

@@ -331,15 +331,15 @@ class ListInvoicesByVendorIdInvoicesBusiness {
 @immutable
 class ListInvoicesByVendorIdInvoicesOrder {
   final String? eventName;
-  final String? hub;
   final String? deparment;
   final String? poReference;
+  final ListInvoicesByVendorIdInvoicesOrderTeamHub teamHub;
   ListInvoicesByVendorIdInvoicesOrder.fromJson(dynamic json):
   
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  hub = json['hub'] == null ? null : nativeFromJson<String>(json['hub']),
   deparment = json['deparment'] == null ? null : nativeFromJson<String>(json['deparment']),
-  poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']);
+  poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']),
+  teamHub = ListInvoicesByVendorIdInvoicesOrderTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -351,13 +351,13 @@ class ListInvoicesByVendorIdInvoicesOrder {
 
     final ListInvoicesByVendorIdInvoicesOrder otherTyped = other as ListInvoicesByVendorIdInvoicesOrder;
     return eventName == otherTyped.eventName && 
-    hub == otherTyped.hub && 
     deparment == otherTyped.deparment && 
-    poReference == otherTyped.poReference;
+    poReference == otherTyped.poReference && 
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([eventName.hashCode, hub.hashCode, deparment.hashCode, poReference.hashCode]);
+  int get hashCode => Object.hashAll([eventName.hashCode, deparment.hashCode, poReference.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -365,23 +365,67 @@ class ListInvoicesByVendorIdInvoicesOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (hub != null) {
-      json['hub'] = nativeToJson<String?>(hub);
-    }
     if (deparment != null) {
       json['deparment'] = nativeToJson<String?>(deparment);
     }
     if (poReference != null) {
       json['poReference'] = nativeToJson<String?>(poReference);
     }
+    json['teamHub'] = teamHub.toJson();
     return json;
   }
 
   ListInvoicesByVendorIdInvoicesOrder({
     this.eventName,
-    this.hub,
     this.deparment,
     this.poReference,
+    required this.teamHub,
+  });
+}
+
+@immutable
+class ListInvoicesByVendorIdInvoicesOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  ListInvoicesByVendorIdInvoicesOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListInvoicesByVendorIdInvoicesOrderTeamHub otherTyped = other as ListInvoicesByVendorIdInvoicesOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  ListInvoicesByVendorIdInvoicesOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_orders.dart

@@ -34,7 +34,6 @@ class ListOrdersOrders {
   final String? vendorId;
   final String businessId;
   final EnumValue<OrderType> orderType;
-  final String? location;
   final EnumValue<OrderStatus> status;
   final Timestamp? date;
   final Timestamp? startDate;
@@ -45,7 +44,6 @@ class ListOrdersOrders {
   final AnyValue? assignedStaff;
   final AnyValue? shifts;
   final int? requested;
-  final String? hub;
   final AnyValue? recurringDays;
   final AnyValue? permanentDays;
   final String? poReference;
@@ -54,6 +52,7 @@ class ListOrdersOrders {
   final Timestamp? createdAt;
   final ListOrdersOrdersBusiness business;
   final ListOrdersOrdersVendor? vendor;
+  final ListOrdersOrdersTeamHub teamHub;
   ListOrdersOrders.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
@@ -61,7 +60,6 @@ class ListOrdersOrders {
   vendorId = json['vendorId'] == null ? null : nativeFromJson<String>(json['vendorId']),
   businessId = nativeFromJson<String>(json['businessId']),
   orderType = orderTypeDeserializer(json['orderType']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']),
   status = orderStatusDeserializer(json['status']),
   date = json['date'] == null ? null : Timestamp.fromJson(json['date']),
   startDate = json['startDate'] == null ? null : Timestamp.fromJson(json['startDate']),
@@ -72,7 +70,6 @@ class ListOrdersOrders {
   assignedStaff = json['assignedStaff'] == null ? null : AnyValue.fromJson(json['assignedStaff']),
   shifts = json['shifts'] == null ? null : AnyValue.fromJson(json['shifts']),
   requested = json['requested'] == null ? null : nativeFromJson<int>(json['requested']),
-  hub = json['hub'] == null ? null : nativeFromJson<String>(json['hub']),
   recurringDays = json['recurringDays'] == null ? null : AnyValue.fromJson(json['recurringDays']),
   permanentDays = json['permanentDays'] == null ? null : AnyValue.fromJson(json['permanentDays']),
   poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']),
@@ -80,7 +77,8 @@ class ListOrdersOrders {
   notes = json['notes'] == null ? null : nativeFromJson<String>(json['notes']),
   createdAt = json['createdAt'] == null ? null : Timestamp.fromJson(json['createdAt']),
   business = ListOrdersOrdersBusiness.fromJson(json['business']),
-  vendor = json['vendor'] == null ? null : ListOrdersOrdersVendor.fromJson(json['vendor']);
+  vendor = json['vendor'] == null ? null : ListOrdersOrdersVendor.fromJson(json['vendor']),
+  teamHub = ListOrdersOrdersTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -96,7 +94,6 @@ class ListOrdersOrders {
     vendorId == otherTyped.vendorId && 
     businessId == otherTyped.businessId && 
     orderType == otherTyped.orderType && 
-    location == otherTyped.location && 
     status == otherTyped.status && 
     date == otherTyped.date && 
     startDate == otherTyped.startDate && 
@@ -107,7 +104,6 @@ class ListOrdersOrders {
     assignedStaff == otherTyped.assignedStaff && 
     shifts == otherTyped.shifts && 
     requested == otherTyped.requested && 
-    hub == otherTyped.hub && 
     recurringDays == otherTyped.recurringDays && 
     permanentDays == otherTyped.permanentDays && 
     poReference == otherTyped.poReference && 
@@ -115,11 +111,12 @@ class ListOrdersOrders {
     notes == otherTyped.notes && 
     createdAt == otherTyped.createdAt && 
     business == otherTyped.business && 
-    vendor == otherTyped.vendor;
+    vendor == otherTyped.vendor && 
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, vendorId.hashCode, businessId.hashCode, orderType.hashCode, location.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, duration.hashCode, lunchBreak.hashCode, total.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, hub.hashCode, recurringDays.hashCode, permanentDays.hashCode, poReference.hashCode, detectedConflicts.hashCode, notes.hashCode, createdAt.hashCode, business.hashCode, vendor.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, vendorId.hashCode, businessId.hashCode, orderType.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, duration.hashCode, lunchBreak.hashCode, total.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, recurringDays.hashCode, permanentDays.hashCode, poReference.hashCode, detectedConflicts.hashCode, notes.hashCode, createdAt.hashCode, business.hashCode, vendor.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -135,9 +132,6 @@ class ListOrdersOrders {
     json['orderType'] = 
     orderTypeSerializer(orderType)
     ;
-    if (location != null) {
-      json['location'] = nativeToJson<String?>(location);
-    }
     json['status'] = 
     orderStatusSerializer(status)
     ;
@@ -170,9 +164,6 @@ class ListOrdersOrders {
     if (requested != null) {
       json['requested'] = nativeToJson<int?>(requested);
     }
-    if (hub != null) {
-      json['hub'] = nativeToJson<String?>(hub);
-    }
     if (recurringDays != null) {
       json['recurringDays'] = recurringDays!.toJson();
     }
@@ -195,6 +186,7 @@ class ListOrdersOrders {
     if (vendor != null) {
       json['vendor'] = vendor!.toJson();
     }
+    json['teamHub'] = teamHub.toJson();
     return json;
   }
 
@@ -204,7 +196,6 @@ class ListOrdersOrders {
     this.vendorId,
     required this.businessId,
     required this.orderType,
-    this.location,
     required this.status,
     this.date,
     this.startDate,
@@ -215,7 +206,6 @@ class ListOrdersOrders {
     this.assignedStaff,
     this.shifts,
     this.requested,
-    this.hub,
     this.recurringDays,
     this.permanentDays,
     this.poReference,
@@ -224,6 +214,7 @@ class ListOrdersOrders {
     this.createdAt,
     required this.business,
     this.vendor,
+    required this.teamHub,
   });
 }
 
@@ -319,6 +310,52 @@ class ListOrdersOrdersVendor {
   });
 }
 
+@immutable
+class ListOrdersOrdersTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  ListOrdersOrdersTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListOrdersOrdersTeamHub otherTyped = other as ListOrdersOrdersTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  ListOrdersOrdersTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
+  });
+}
+
 @immutable
 class ListOrdersData {
   final List<ListOrdersOrders> orders;

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_overdue_invoices.dart

@@ -331,15 +331,15 @@ class ListOverdueInvoicesInvoicesBusiness {
 @immutable
 class ListOverdueInvoicesInvoicesOrder {
   final String? eventName;
-  final String? hub;
   final String? deparment;
   final String? poReference;
+  final ListOverdueInvoicesInvoicesOrderTeamHub teamHub;
   ListOverdueInvoicesInvoicesOrder.fromJson(dynamic json):
   
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  hub = json['hub'] == null ? null : nativeFromJson<String>(json['hub']),
   deparment = json['deparment'] == null ? null : nativeFromJson<String>(json['deparment']),
-  poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']);
+  poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']),
+  teamHub = ListOverdueInvoicesInvoicesOrderTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -351,13 +351,13 @@ class ListOverdueInvoicesInvoicesOrder {
 
     final ListOverdueInvoicesInvoicesOrder otherTyped = other as ListOverdueInvoicesInvoicesOrder;
     return eventName == otherTyped.eventName && 
-    hub == otherTyped.hub && 
     deparment == otherTyped.deparment && 
-    poReference == otherTyped.poReference;
+    poReference == otherTyped.poReference && 
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([eventName.hashCode, hub.hashCode, deparment.hashCode, poReference.hashCode]);
+  int get hashCode => Object.hashAll([eventName.hashCode, deparment.hashCode, poReference.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -365,23 +365,67 @@ class ListOverdueInvoicesInvoicesOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (hub != null) {
-      json['hub'] = nativeToJson<String?>(hub);
-    }
     if (deparment != null) {
       json['deparment'] = nativeToJson<String?>(deparment);
     }
     if (poReference != null) {
       json['poReference'] = nativeToJson<String?>(poReference);
     }
+    json['teamHub'] = teamHub.toJson();
     return json;
   }
 
   ListOverdueInvoicesInvoicesOrder({
     this.eventName,
-    this.hub,
     this.deparment,
     this.poReference,
+    required this.teamHub,
+  });
+}
+
+@immutable
+class ListOverdueInvoicesInvoicesOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  ListOverdueInvoicesInvoicesOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListOverdueInvoicesInvoicesOrderTeamHub otherTyped = other as ListOverdueInvoicesInvoicesOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  ListOverdueInvoicesInvoicesOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_recent_payments_by_application_id.dart

@@ -467,12 +467,12 @@ class ListRecentPaymentsByApplicationIdRecentPaymentsInvoiceVendor {
 class ListRecentPaymentsByApplicationIdRecentPaymentsInvoiceOrder {
   final String id;
   final String? eventName;
-  final String? location;
+  final ListRecentPaymentsByApplicationIdRecentPaymentsInvoiceOrderTeamHub teamHub;
   ListRecentPaymentsByApplicationIdRecentPaymentsInvoiceOrder.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']);
+  teamHub = ListRecentPaymentsByApplicationIdRecentPaymentsInvoiceOrderTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -485,11 +485,11 @@ class ListRecentPaymentsByApplicationIdRecentPaymentsInvoiceOrder {
     final ListRecentPaymentsByApplicationIdRecentPaymentsInvoiceOrder otherTyped = other as ListRecentPaymentsByApplicationIdRecentPaymentsInvoiceOrder;
     return id == otherTyped.id && 
     eventName == otherTyped.eventName && 
-    location == otherTyped.location;
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, location.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -498,16 +498,60 @@ class ListRecentPaymentsByApplicationIdRecentPaymentsInvoiceOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (location != null) {
+    json['teamHub'] = teamHub.toJson();
-      json['location'] = nativeToJson<String?>(location);
-    }
     return json;
   }
 
   ListRecentPaymentsByApplicationIdRecentPaymentsInvoiceOrder({
     required this.id,
     this.eventName,
-    this.location,
+    required this.teamHub,
+  });
+}
+
+@immutable
+class ListRecentPaymentsByApplicationIdRecentPaymentsInvoiceOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  ListRecentPaymentsByApplicationIdRecentPaymentsInvoiceOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListRecentPaymentsByApplicationIdRecentPaymentsInvoiceOrderTeamHub otherTyped = other as ListRecentPaymentsByApplicationIdRecentPaymentsInvoiceOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  ListRecentPaymentsByApplicationIdRecentPaymentsInvoiceOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_recent_payments_by_business_id.dart

@@ -517,12 +517,12 @@ class ListRecentPaymentsByBusinessIdRecentPaymentsInvoiceVendor {
 class ListRecentPaymentsByBusinessIdRecentPaymentsInvoiceOrder {
   final String id;
   final String? eventName;
-  final String? location;
+  final ListRecentPaymentsByBusinessIdRecentPaymentsInvoiceOrderTeamHub teamHub;
   ListRecentPaymentsByBusinessIdRecentPaymentsInvoiceOrder.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']);
+  teamHub = ListRecentPaymentsByBusinessIdRecentPaymentsInvoiceOrderTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -535,11 +535,11 @@ class ListRecentPaymentsByBusinessIdRecentPaymentsInvoiceOrder {
     final ListRecentPaymentsByBusinessIdRecentPaymentsInvoiceOrder otherTyped = other as ListRecentPaymentsByBusinessIdRecentPaymentsInvoiceOrder;
     return id == otherTyped.id && 
     eventName == otherTyped.eventName && 
-    location == otherTyped.location;
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, location.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -548,16 +548,60 @@ class ListRecentPaymentsByBusinessIdRecentPaymentsInvoiceOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (location != null) {
+    json['teamHub'] = teamHub.toJson();
-      json['location'] = nativeToJson<String?>(location);
-    }
     return json;
   }
 
   ListRecentPaymentsByBusinessIdRecentPaymentsInvoiceOrder({
     required this.id,
     this.eventName,
-    this.location,
+    required this.teamHub,
+  });
+}
+
+@immutable
+class ListRecentPaymentsByBusinessIdRecentPaymentsInvoiceOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  ListRecentPaymentsByBusinessIdRecentPaymentsInvoiceOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListRecentPaymentsByBusinessIdRecentPaymentsInvoiceOrderTeamHub otherTyped = other as ListRecentPaymentsByBusinessIdRecentPaymentsInvoiceOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  ListRecentPaymentsByBusinessIdRecentPaymentsInvoiceOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_recent_payments_by_invoice_id.dart

@@ -465,12 +465,12 @@ class ListRecentPaymentsByInvoiceIdRecentPaymentsInvoiceVendor {
 class ListRecentPaymentsByInvoiceIdRecentPaymentsInvoiceOrder {
   final String id;
   final String? eventName;
-  final String? location;
+  final ListRecentPaymentsByInvoiceIdRecentPaymentsInvoiceOrderTeamHub teamHub;
   ListRecentPaymentsByInvoiceIdRecentPaymentsInvoiceOrder.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']);
+  teamHub = ListRecentPaymentsByInvoiceIdRecentPaymentsInvoiceOrderTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -483,11 +483,11 @@ class ListRecentPaymentsByInvoiceIdRecentPaymentsInvoiceOrder {
     final ListRecentPaymentsByInvoiceIdRecentPaymentsInvoiceOrder otherTyped = other as ListRecentPaymentsByInvoiceIdRecentPaymentsInvoiceOrder;
     return id == otherTyped.id && 
     eventName == otherTyped.eventName && 
-    location == otherTyped.location;
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, location.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -496,16 +496,60 @@ class ListRecentPaymentsByInvoiceIdRecentPaymentsInvoiceOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (location != null) {
+    json['teamHub'] = teamHub.toJson();
-      json['location'] = nativeToJson<String?>(location);
-    }
     return json;
   }
 
   ListRecentPaymentsByInvoiceIdRecentPaymentsInvoiceOrder({
     required this.id,
     this.eventName,
-    this.location,
+    required this.teamHub,
+  });
+}
+
+@immutable
+class ListRecentPaymentsByInvoiceIdRecentPaymentsInvoiceOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  ListRecentPaymentsByInvoiceIdRecentPaymentsInvoiceOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListRecentPaymentsByInvoiceIdRecentPaymentsInvoiceOrderTeamHub otherTyped = other as ListRecentPaymentsByInvoiceIdRecentPaymentsInvoiceOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  ListRecentPaymentsByInvoiceIdRecentPaymentsInvoiceOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_recent_payments_by_invoice_ids.dart

@@ -460,12 +460,12 @@ class ListRecentPaymentsByInvoiceIdsRecentPaymentsInvoiceVendor {
 class ListRecentPaymentsByInvoiceIdsRecentPaymentsInvoiceOrder {
   final String id;
   final String? eventName;
-  final String? location;
+  final ListRecentPaymentsByInvoiceIdsRecentPaymentsInvoiceOrderTeamHub teamHub;
   ListRecentPaymentsByInvoiceIdsRecentPaymentsInvoiceOrder.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']);
+  teamHub = ListRecentPaymentsByInvoiceIdsRecentPaymentsInvoiceOrderTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -478,11 +478,11 @@ class ListRecentPaymentsByInvoiceIdsRecentPaymentsInvoiceOrder {
     final ListRecentPaymentsByInvoiceIdsRecentPaymentsInvoiceOrder otherTyped = other as ListRecentPaymentsByInvoiceIdsRecentPaymentsInvoiceOrder;
     return id == otherTyped.id && 
     eventName == otherTyped.eventName && 
-    location == otherTyped.location;
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, location.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -491,16 +491,60 @@ class ListRecentPaymentsByInvoiceIdsRecentPaymentsInvoiceOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (location != null) {
+    json['teamHub'] = teamHub.toJson();
-      json['location'] = nativeToJson<String?>(location);
-    }
     return json;
   }
 
   ListRecentPaymentsByInvoiceIdsRecentPaymentsInvoiceOrder({
     required this.id,
     this.eventName,
-    this.location,
+    required this.teamHub,
+  });
+}
+
+@immutable
+class ListRecentPaymentsByInvoiceIdsRecentPaymentsInvoiceOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  ListRecentPaymentsByInvoiceIdsRecentPaymentsInvoiceOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListRecentPaymentsByInvoiceIdsRecentPaymentsInvoiceOrderTeamHub otherTyped = other as ListRecentPaymentsByInvoiceIdsRecentPaymentsInvoiceOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  ListRecentPaymentsByInvoiceIdsRecentPaymentsInvoiceOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_recent_payments_by_staff_id.dart

@@ -491,12 +491,12 @@ class ListRecentPaymentsByStaffIdRecentPaymentsInvoiceVendor {
 class ListRecentPaymentsByStaffIdRecentPaymentsInvoiceOrder {
   final String id;
   final String? eventName;
-  final String? location;
+  final ListRecentPaymentsByStaffIdRecentPaymentsInvoiceOrderTeamHub teamHub;
   ListRecentPaymentsByStaffIdRecentPaymentsInvoiceOrder.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']);
+  teamHub = ListRecentPaymentsByStaffIdRecentPaymentsInvoiceOrderTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -509,11 +509,11 @@ class ListRecentPaymentsByStaffIdRecentPaymentsInvoiceOrder {
     final ListRecentPaymentsByStaffIdRecentPaymentsInvoiceOrder otherTyped = other as ListRecentPaymentsByStaffIdRecentPaymentsInvoiceOrder;
     return id == otherTyped.id && 
     eventName == otherTyped.eventName && 
-    location == otherTyped.location;
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, location.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -522,16 +522,60 @@ class ListRecentPaymentsByStaffIdRecentPaymentsInvoiceOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (location != null) {
+    json['teamHub'] = teamHub.toJson();
-      json['location'] = nativeToJson<String?>(location);
-    }
     return json;
   }
 
   ListRecentPaymentsByStaffIdRecentPaymentsInvoiceOrder({
     required this.id,
     this.eventName,
-    this.location,
+    required this.teamHub,
+  });
+}
+
+@immutable
+class ListRecentPaymentsByStaffIdRecentPaymentsInvoiceOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  ListRecentPaymentsByStaffIdRecentPaymentsInvoiceOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListRecentPaymentsByStaffIdRecentPaymentsInvoiceOrderTeamHub otherTyped = other as ListRecentPaymentsByStaffIdRecentPaymentsInvoiceOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  ListRecentPaymentsByStaffIdRecentPaymentsInvoiceOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_recent_payments_by_status.dart

@@ -460,12 +460,12 @@ class ListRecentPaymentsByStatusRecentPaymentsInvoiceVendor {
 class ListRecentPaymentsByStatusRecentPaymentsInvoiceOrder {
   final String id;
   final String? eventName;
-  final String? location;
+  final ListRecentPaymentsByStatusRecentPaymentsInvoiceOrderTeamHub teamHub;
   ListRecentPaymentsByStatusRecentPaymentsInvoiceOrder.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']);
+  teamHub = ListRecentPaymentsByStatusRecentPaymentsInvoiceOrderTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -478,11 +478,11 @@ class ListRecentPaymentsByStatusRecentPaymentsInvoiceOrder {
     final ListRecentPaymentsByStatusRecentPaymentsInvoiceOrder otherTyped = other as ListRecentPaymentsByStatusRecentPaymentsInvoiceOrder;
     return id == otherTyped.id && 
     eventName == otherTyped.eventName && 
-    location == otherTyped.location;
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, location.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -491,16 +491,60 @@ class ListRecentPaymentsByStatusRecentPaymentsInvoiceOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (location != null) {
+    json['teamHub'] = teamHub.toJson();
-      json['location'] = nativeToJson<String?>(location);
-    }
     return json;
   }
 
   ListRecentPaymentsByStatusRecentPaymentsInvoiceOrder({
     required this.id,
     this.eventName,
-    this.location,
+    required this.teamHub,
+  });
+}
+
+@immutable
+class ListRecentPaymentsByStatusRecentPaymentsInvoiceOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  ListRecentPaymentsByStatusRecentPaymentsInvoiceOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListRecentPaymentsByStatusRecentPaymentsInvoiceOrderTeamHub otherTyped = other as ListRecentPaymentsByStatusRecentPaymentsInvoiceOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  ListRecentPaymentsByStatusRecentPaymentsInvoiceOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_shift_roles_by_business_and_order.dart

@@ -256,12 +256,12 @@ class ListShiftRolesByBusinessAndOrderShiftRolesShift {
 class ListShiftRolesByBusinessAndOrderShiftRolesShiftOrder {
   final String? vendorId;
   final Timestamp? date;
-  final String? location;
+  final ListShiftRolesByBusinessAndOrderShiftRolesShiftOrderTeamHub teamHub;
   ListShiftRolesByBusinessAndOrderShiftRolesShiftOrder.fromJson(dynamic json):
   
   vendorId = json['vendorId'] == null ? null : nativeFromJson<String>(json['vendorId']),
   date = json['date'] == null ? null : Timestamp.fromJson(json['date']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']);
+  teamHub = ListShiftRolesByBusinessAndOrderShiftRolesShiftOrderTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -274,11 +274,11 @@ class ListShiftRolesByBusinessAndOrderShiftRolesShiftOrder {
     final ListShiftRolesByBusinessAndOrderShiftRolesShiftOrder otherTyped = other as ListShiftRolesByBusinessAndOrderShiftRolesShiftOrder;
     return vendorId == otherTyped.vendorId && 
     date == otherTyped.date && 
-    location == otherTyped.location;
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([vendorId.hashCode, date.hashCode, location.hashCode]);
+  int get hashCode => Object.hashAll([vendorId.hashCode, date.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -289,16 +289,60 @@ class ListShiftRolesByBusinessAndOrderShiftRolesShiftOrder {
     if (date != null) {
       json['date'] = date!.toJson();
     }
-    if (location != null) {
+    json['teamHub'] = teamHub.toJson();
-      json['location'] = nativeToJson<String?>(location);
-    }
     return json;
   }
 
   ListShiftRolesByBusinessAndOrderShiftRolesShiftOrder({
     this.vendorId,
     this.date,
-    this.location,
+    required this.teamHub,
+  });
+}
+
+@immutable
+class ListShiftRolesByBusinessAndOrderShiftRolesShiftOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  ListShiftRolesByBusinessAndOrderShiftRolesShiftOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListShiftRolesByBusinessAndOrderShiftRolesShiftOrderTeamHub otherTyped = other as ListShiftRolesByBusinessAndOrderShiftRolesShiftOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  ListShiftRolesByBusinessAndOrderShiftRolesShiftOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/update_order.dart

@@ -4,7 +4,6 @@ class UpdateOrderVariablesBuilder {
   String id;
   Optional<String> _vendorId = Optional.optional(nativeFromJson, nativeToJson);
   Optional<String> _businessId = Optional.optional(nativeFromJson, nativeToJson);
-  Optional<String> _location = Optional.optional(nativeFromJson, nativeToJson);
   Optional<OrderStatus> _status = Optional.optional((data) => OrderStatus.values.byName(data), enumSerializer);
   Optional<Timestamp> _date = Optional.optional((json) => json['date'] = Timestamp.fromJson(json['date']), defaultSerializer);
   Optional<Timestamp> _startDate = Optional.optional((json) => json['startDate'] = Timestamp.fromJson(json['startDate']), defaultSerializer);
@@ -14,7 +13,7 @@ class UpdateOrderVariablesBuilder {
   Optional<AnyValue> _assignedStaff = Optional.optional(AnyValue.fromJson, defaultSerializer);
   Optional<AnyValue> _shifts = Optional.optional(AnyValue.fromJson, defaultSerializer);
   Optional<int> _requested = Optional.optional(nativeFromJson, nativeToJson);
-  Optional<String> _hub = Optional.optional(nativeFromJson, nativeToJson);
+  String teamHubId;
   Optional<AnyValue> _recurringDays = Optional.optional(AnyValue.fromJson, defaultSerializer);
   Optional<AnyValue> _permanentDays = Optional.optional(AnyValue.fromJson, defaultSerializer);
   Optional<String> _notes = Optional.optional(nativeFromJson, nativeToJson);
@@ -29,10 +28,6 @@ class UpdateOrderVariablesBuilder {
    _businessId.value = t;
    return this;
   }
-  UpdateOrderVariablesBuilder location(String? t) {
-   _location.value = t;
-   return this;
-  }
   UpdateOrderVariablesBuilder status(OrderStatus? t) {
    _status.value = t;
    return this;
@@ -69,10 +64,6 @@ class UpdateOrderVariablesBuilder {
    _requested.value = t;
    return this;
   }
-  UpdateOrderVariablesBuilder hub(String? t) {
-   _hub.value = t;
-   return this;
-  }
   UpdateOrderVariablesBuilder recurringDays(AnyValue? t) {
    _recurringDays.value = t;
    return this;
@@ -94,7 +85,7 @@ class UpdateOrderVariablesBuilder {
    return this;
   }
 
-  UpdateOrderVariablesBuilder(this._dataConnect, {required  this.id,});
+  UpdateOrderVariablesBuilder(this._dataConnect, {required  this.id,required  this.teamHubId,});
   Deserializer<UpdateOrderData> dataDeserializer = (dynamic json)  => UpdateOrderData.fromJson(jsonDecode(json));
   Serializer<UpdateOrderVariables> varsSerializer = (UpdateOrderVariables vars) => jsonEncode(vars.toJson());
   Future<OperationResult<UpdateOrderData, UpdateOrderVariables>> execute() {
@@ -102,7 +93,7 @@ class UpdateOrderVariablesBuilder {
   }
 
   MutationRef<UpdateOrderData, UpdateOrderVariables> ref() {
-    UpdateOrderVariables vars= UpdateOrderVariables(id: id,vendorId: _vendorId,businessId: _businessId,location: _location,status: _status,date: _date,startDate: _startDate,endDate: _endDate,total: _total,eventName: _eventName,assignedStaff: _assignedStaff,shifts: _shifts,requested: _requested,hub: _hub,recurringDays: _recurringDays,permanentDays: _permanentDays,notes: _notes,detectedConflicts: _detectedConflicts,poReference: _poReference,);
+    UpdateOrderVariables vars= UpdateOrderVariables(id: id,vendorId: _vendorId,businessId: _businessId,status: _status,date: _date,startDate: _startDate,endDate: _endDate,total: _total,eventName: _eventName,assignedStaff: _assignedStaff,shifts: _shifts,requested: _requested,teamHubId: teamHubId,recurringDays: _recurringDays,permanentDays: _permanentDays,notes: _notes,detectedConflicts: _detectedConflicts,poReference: _poReference,);
     return _dataConnect.mutation("updateOrder", dataDeserializer, varsSerializer, vars);
   }
 }
@@ -182,7 +173,6 @@ class UpdateOrderVariables {
   final String id;
   late final Optional<String>vendorId;
   late final Optional<String>businessId;
-  late final Optional<String>location;
   late final Optional<OrderStatus>status;
   late final Optional<Timestamp>date;
   late final Optional<Timestamp>startDate;
@@ -192,7 +182,7 @@ class UpdateOrderVariables {
   late final Optional<AnyValue>assignedStaff;
   late final Optional<AnyValue>shifts;
   late final Optional<int>requested;
-  late final Optional<String>hub;
+  final String teamHubId;
   late final Optional<AnyValue>recurringDays;
   late final Optional<AnyValue>permanentDays;
   late final Optional<String>notes;
@@ -201,7 +191,8 @@ class UpdateOrderVariables {
   @Deprecated('fromJson is deprecated for Variable classes as they are no longer required for deserialization.')
   UpdateOrderVariables.fromJson(Map<String, dynamic> json):
   
-  id = nativeFromJson<String>(json['id']) {
+  id = nativeFromJson<String>(json['id']),
+  teamHubId = nativeFromJson<String>(json['teamHubId']) {
   
   
   
@@ -213,10 +204,6 @@ class UpdateOrderVariables {
     businessId.value = json['businessId'] == null ? null : nativeFromJson<String>(json['businessId']);
   
   
-    location = Optional.optional(nativeFromJson, nativeToJson);
-    location.value = json['location'] == null ? null : nativeFromJson<String>(json['location']);
-  
-  
     status = Optional.optional((data) => OrderStatus.values.byName(data), enumSerializer);
     status.value = json['status'] == null ? null : OrderStatus.values.byName(json['status']);
   
@@ -253,9 +240,6 @@ class UpdateOrderVariables {
     requested.value = json['requested'] == null ? null : nativeFromJson<int>(json['requested']);
   
   
-    hub = Optional.optional(nativeFromJson, nativeToJson);
-    hub.value = json['hub'] == null ? null : nativeFromJson<String>(json['hub']);
-  
   
     recurringDays = Optional.optional(AnyValue.fromJson, defaultSerializer);
     recurringDays.value = json['recurringDays'] == null ? null : AnyValue.fromJson(json['recurringDays']);
@@ -290,7 +274,6 @@ class UpdateOrderVariables {
     return id == otherTyped.id && 
     vendorId == otherTyped.vendorId && 
     businessId == otherTyped.businessId && 
-    location == otherTyped.location && 
     status == otherTyped.status && 
     date == otherTyped.date && 
     startDate == otherTyped.startDate && 
@@ -300,7 +283,7 @@ class UpdateOrderVariables {
     assignedStaff == otherTyped.assignedStaff && 
     shifts == otherTyped.shifts && 
     requested == otherTyped.requested && 
-    hub == otherTyped.hub && 
+    teamHubId == otherTyped.teamHubId && 
     recurringDays == otherTyped.recurringDays && 
     permanentDays == otherTyped.permanentDays && 
     notes == otherTyped.notes && 
@@ -309,7 +292,7 @@ class UpdateOrderVariables {
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, vendorId.hashCode, businessId.hashCode, location.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, total.hashCode, eventName.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, hub.hashCode, recurringDays.hashCode, permanentDays.hashCode, notes.hashCode, detectedConflicts.hashCode, poReference.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, vendorId.hashCode, businessId.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, total.hashCode, eventName.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, teamHubId.hashCode, recurringDays.hashCode, permanentDays.hashCode, notes.hashCode, detectedConflicts.hashCode, poReference.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -321,9 +304,6 @@ class UpdateOrderVariables {
     if(businessId.state == OptionalState.set) {
       json['businessId'] = businessId.toJson();
     }
-    if(location.state == OptionalState.set) {
-      json['location'] = location.toJson();
-    }
     if(status.state == OptionalState.set) {
       json['status'] = status.toJson();
     }
@@ -351,9 +331,7 @@ class UpdateOrderVariables {
     if(requested.state == OptionalState.set) {
       json['requested'] = requested.toJson();
     }
-    if(hub.state == OptionalState.set) {
+    json['teamHubId'] = nativeToJson<String>(teamHubId);
-      json['hub'] = hub.toJson();
-    }
     if(recurringDays.state == OptionalState.set) {
       json['recurringDays'] = recurringDays.toJson();
     }
@@ -376,7 +354,6 @@ class UpdateOrderVariables {
     required this.id,
     required this.vendorId,
     required this.businessId,
-    required this.location,
     required this.status,
     required this.date,
     required this.startDate,
@@ -386,7 +363,7 @@ class UpdateOrderVariables {
     required this.assignedStaff,
     required this.shifts,
     required this.requested,
-    required this.hub,
+    required this.teamHubId,
     required this.recurringDays,
     required this.permanentDays,
     required this.notes,

backend/dataconnect/connector/application/queries.gql

@@ -22,7 +22,14 @@ query listApplications @auth(level: USER) {
       order {
         id
         eventName
-        location
+        #location
+
+        teamHub {
+          address
+          placeId
+          hubName
+        }
+      
         business {
           id
           businessName
@@ -78,7 +85,14 @@ query getApplicationById($id: UUID!) @auth(level: USER) {
       order {
         id
         eventName
-        location
+        #location
+
+        teamHub {
+          address
+          placeId
+          hubName
+        }
+      
         business {
           id
           businessName
@@ -135,7 +149,14 @@ query getApplicationsByShiftId($shiftId: UUID!) @auth(level: USER) {
       order {
         id
         eventName
-        location
+        #location
+
+        teamHub {
+          address
+          placeId
+          hubName
+        }
+      
         business {
           id
           businessName
@@ -205,7 +226,14 @@ query getApplicationsByShiftIdAndStatus(
       order {
         id
         eventName
-        location
+        #location
+
+        teamHub {
+          address
+          placeId
+          hubName
+        }
+      
         business {
           id
           businessName
@@ -269,7 +297,14 @@ query getApplicationsByStaffId(
       order {
         id
         eventName
-        location
+        #location
+
+        teamHub {
+          address
+          placeId
+          hubName
+        }
+      
         business {
           id
           businessName

backend/dataconnect/connector/invoice/queries.gql

@@ -50,9 +50,15 @@ query listInvoices(
     }
     order { 
       eventName
-      hub
       deparment
       poReference
+
+      teamHub {
+        address
+        placeId
+        hubName
+      }
+      
     }
   }
 }
@@ -105,9 +111,15 @@ query getInvoiceById($id: UUID!) @auth(level: USER) {
     }
     order { 
       eventName
-      hub
       deparment
       poReference
+
+      teamHub {
+        address
+        placeId
+        hubName
+      }
+
     }
   }
 }
@@ -169,9 +181,15 @@ query listInvoicesByVendorId(
     }
     order { 
       eventName
-      hub
       deparment
       poReference
+
+      teamHub {
+        address
+        placeId
+        hubName
+      }
+      
     }
   }
 }
@@ -233,9 +251,15 @@ query listInvoicesByBusinessId(
     }
     order { 
       eventName
-      hub
       deparment
       poReference
+
+      teamHub {
+        address
+        placeId
+        hubName
+      }
+      
     }
   }
 }
@@ -297,9 +321,15 @@ query listInvoicesByOrderId(
     }
     order { 
       eventName
-      hub
       deparment
       poReference
+
+      teamHub {
+        address
+        placeId
+        hubName
+      }
+      
     }
   }
 }
@@ -361,9 +391,15 @@ query listInvoicesByStatus(
     }
     order { 
       eventName
-      hub
       deparment
       poReference
+
+      teamHub {
+        address
+        placeId
+        hubName
+      }
+      
     }
   }
 }
@@ -444,9 +480,15 @@ query filterInvoices(
     }
     order { 
       eventName
-      hub
       deparment
       poReference
+
+      teamHub {
+        address
+        placeId
+        hubName
+      }
+      
     }
   }
 }
@@ -512,9 +554,15 @@ query listOverdueInvoices(
     }
     order { 
       eventName
-      hub
       deparment
       poReference
+
+      teamHub {
+        address
+        placeId
+        hubName
+      }
+      
     }
   }
 }

backend/dataconnect/connector/recentPayment/queries.gql

@@ -159,7 +159,18 @@ query listRecentPaymentsByStaffId(
 
       business { id businessName }
       vendor { id companyName }
-      order { id eventName location }
+      order { 
+        id 
+        eventName 
+        #location 
+
+        teamHub {
+          address
+          placeId
+          hubName
+        }
+      
+      }
     }
   }
 }
@@ -205,7 +216,18 @@ query listRecentPaymentsByApplicationId(
       amount
       business { id businessName }
       vendor { id companyName }
-      order { id eventName location }
+      order { 
+        id 
+        eventName 
+        #location 
+
+        teamHub {
+          address
+          placeId
+          hubName
+        }
+      
+      }
     }
   }
 }
@@ -251,7 +273,18 @@ query listRecentPaymentsByInvoiceId(
       amount
       business { id businessName }
       vendor { id companyName }
-      order { id eventName location }
+      order { 
+        id 
+        eventName 
+        #location 
+
+        teamHub {
+          address
+          placeId
+          hubName
+        }
+      
+      }
     }
   }
 }
@@ -297,7 +330,18 @@ query listRecentPaymentsByStatus(
       amount
       business { id businessName }
       vendor { id companyName }
-      order { id eventName location }
+      order { 
+        id 
+        eventName 
+        #location 
+
+        teamHub {
+          address
+          placeId
+          hubName
+        }
+      
+      }
     }
   }
 }
@@ -344,7 +388,18 @@ query listRecentPaymentsByInvoiceIds(
       amount
       business { id businessName }
       vendor { id companyName }
-      order { id eventName location }
+      order { 
+        id 
+        eventName 
+        #location 
+
+        teamHub {
+          address
+          placeId
+          hubName
+        }
+      
+      }
     }
   }
 }
@@ -411,7 +466,18 @@ query listRecentPaymentsByBusinessId(
 
       business { id businessName }
       vendor { id companyName }
-      order { id eventName location }
+      order { 
+        id 
+        eventName 
+        #location 
+
+        teamHub {
+          address
+          placeId
+          hubName
+        }
+      
+      }
     }
   }
 }

backend/dataconnect/connector/shiftRole/queries.gql

@@ -379,7 +379,14 @@ query listShiftRolesByBusinessAndOrder(
       order{
         vendorId
         date
-        location
+        #location
+
+        teamHub {
+          address
+          placeId
+          hubName
+        }
+      
       }
     }
   }