Merge dev

apps/mobile/packages/domain/lib/src/entities/orders/permanent_order.dart

@@ -26,7 +26,11 @@ class PermanentOrder extends Equatable {
   final Map<String, double> roleRates;
 
   @override
+<<<<<<< Updated upstream
   List<Object?> get props => <Object?>[
+=======
+  List<Object?> get props => [
+>>>>>>> Stashed changes
         startDate,
         permanentDays,
         positions,

apps/mobile/packages/domain/lib/src/entities/orders/recurring_order.dart

@@ -1,13 +1,23 @@
 import 'package:equatable/equatable.dart';
+<<<<<<< Updated upstream
 import 'recurring_order_position.dart';
 
 /// Represents a recurring staffing request spanning a date range.
+=======
+import 'one_time_order.dart';
+import 'one_time_order_position.dart';
+
+/// Represents a customer's request for recurring staffing.
+>>>>>>> Stashed changes
 class RecurringOrder extends Equatable {
   const RecurringOrder({
     required this.startDate,
     required this.endDate,
     required this.recurringDays,
+<<<<<<< Updated upstream
     required this.location,
+=======
+>>>>>>> Stashed changes
     required this.positions,
     this.hub,
     this.eventName,
@@ -15,6 +25,7 @@ class RecurringOrder extends Equatable {
     this.roleRates = const <String, double>{},
   });
 
+<<<<<<< Updated upstream
   /// Start date for the recurring schedule.
   final DateTime startDate;
 
@@ -48,6 +59,25 @@ class RecurringOrder extends Equatable {
         endDate,
         recurringDays,
         location,
+=======
+  final DateTime startDate;
+  final DateTime endDate;
+  
+  /// List of days (e.g., ['Monday', 'Wednesday']) or bitmask.
+  final List<String> recurringDays;
+  
+  final List<OneTimeOrderPosition> positions;
+  final OneTimeOrderHubDetails? hub;
+  final String? eventName;
+  final String? vendorId;
+  final Map<String, double> roleRates;
+
+  @override
+  List<Object?> get props => [
+        startDate,
+        endDate,
+        recurringDays,
+>>>>>>> Stashed changes
         positions,
         hub,
         eventName,
@@ -55,6 +85,7 @@ class RecurringOrder extends Equatable {
         roleRates,
       ];
 }
+<<<<<<< Updated upstream
 
 /// Minimal hub details used during recurring order creation.
 class RecurringOrderHubDetails extends Equatable {
@@ -99,3 +130,5 @@ class RecurringOrderHubDetails extends Equatable {
         zipCode,
       ];
 }
+=======
+>>>>>>> Stashed changes