Merge branch 'dev' into 493-implement-rapid-order-creation-voice-text-in-client-mobile-app

apps/mobile/packages/features/client/orders/view_orders/lib/src/data/repositories/view_orders_repository_impl.dart

@@ -73,11 +73,15 @@ class ViewOrdersRepositoryImpl implements IViewOrdersRepository {
         final String eventName =
             shiftRole.shift.order.eventName ?? shiftRole.shift.title;
 
+        final order = shiftRole.shift.order;
+        final String? hubManagerId = order.hubManagerId;
+        final String? hubManagerName = order.hubManager?.user?.fullName;
+
         return domain.OrderItem(
           id: _shiftRoleKey(shiftRole.shiftId, shiftRole.roleId),
-          orderId: shiftRole.shift.order.id,
+          orderId: order.id,
           orderType: domain.OrderType.fromString(
-            shiftRole.shift.order.orderType.stringValue,
+            order.orderType.stringValue,
           ),
           title: shiftRole.role.name,
           eventName: eventName,
@@ -94,6 +98,8 @@ class ViewOrdersRepositoryImpl implements IViewOrdersRepository {
           hours: hours,
           totalValue: totalValue,
           confirmedApps: const <Map<String, dynamic>>[],
+          hubManagerId: hubManagerId,
+          hubManagerName: hubManagerName,
         );
       }).toList();
     });

apps/mobile/packages/features/client/orders/view_orders/lib/src/presentation/blocs/view_orders_cubit.dart

@@ -193,6 +193,8 @@ class ViewOrdersCubit extends Cubit<ViewOrdersState>
         hours: order.hours,
         totalValue: order.totalValue,
         confirmedApps: confirmed,
+        hubManagerId: order.hubManagerId,
+        hubManagerName: order.hubManagerName,
       );
     }).toList();
   }

apps/mobile/packages/features/client/orders/view_orders/lib/src/presentation/widgets/order_edit_sheet.dart

@@ -692,7 +692,7 @@ class OrderEditSheetState extends State<OrderEditSheet> {
                 ),
                 const SizedBox(height: UiConstants.space4),
 
-                _buildSectionHeader('VENDOR'),
+                _buildSectionHeader(t.client_orders_common.select_vendor),
                 Container(
                   padding: const EdgeInsets.symmetric(
                     horizontal: UiConstants.space3,
@@ -742,7 +742,7 @@ class OrderEditSheetState extends State<OrderEditSheet> {
                 ),
                 const SizedBox(height: UiConstants.space4),
 
-                _buildSectionHeader('ORDER NAME'),
+                _buildSectionHeader(t.client_orders_common.order_name),
                 UiTextField(
                   controller: _orderNameController,
                   hintText: t.client_view_orders.order_edit_sheet.order_name_hint,
@@ -750,7 +750,7 @@ class OrderEditSheetState extends State<OrderEditSheet> {
                 ),
                 const SizedBox(height: UiConstants.space4),
 
-                _buildSectionHeader('HUB'),
+                _buildSectionHeader(t.client_orders_common.hub),
                 Container(
                   padding: const EdgeInsets.symmetric(
                     horizontal: UiConstants.space3,

apps/mobile/packages/features/client/orders/view_orders/lib/src/presentation/widgets/view_order_card.dart

@@ -108,6 +108,43 @@ class _ViewOrderCardState extends State<ViewOrderCard> {
     }
   }
 
+  /// Returns true if the edit icon should be shown.
+  /// Hidden for completed orders and for past orders (shift has ended).
+  bool _canEditOrder(OrderItem order) {
+    if (order.status == 'COMPLETED') return false;
+    if (order.date.isEmpty) return true;
+    try {
+      final DateTime orderDate = DateTime.parse(order.date);
+      final String endTime = order.endTime.trim();
+      final DateTime endDateTime;
+      if (endTime.isEmpty) {
+        // No end time: use end of day so orders today remain editable
+        endDateTime = DateTime(
+          orderDate.year,
+          orderDate.month,
+          orderDate.day,
+          23,
+          59,
+          59,
+        );
+      } else {
+        final List<String> endParts = endTime.split(':');
+        final int hour = endParts.isNotEmpty ? int.parse(endParts[0]) : 0;
+        final int minute = endParts.length > 1 ? int.parse(endParts[1]) : 0;
+        endDateTime = DateTime(
+          orderDate.year,
+          orderDate.month,
+          orderDate.day,
+          hour,
+          minute,
+        );
+      }
+      return endDateTime.isAfter(DateTime.now());
+    } catch (_) {
+      return true;
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     final OrderItem order = widget.order;
@@ -291,13 +328,14 @@ class _ViewOrderCardState extends State<ViewOrderCard> {
                     // Actions
                     Row(
                       children: <Widget>[
-                        _buildHeaderIconButton(
-                          icon: UiIcons.edit,
-                          color: UiColors.primary,
-                          bgColor: UiColors.primary.withValues(alpha: 0.08),
-                          onTap: () => _openEditSheet(order: order),
-                        ),
-                        const SizedBox(width: UiConstants.space2),
+                        if (_canEditOrder(order))
+                          _buildHeaderIconButton(
+                            icon: UiIcons.edit,
+                            color: UiColors.primary,
+                            bgColor: UiColors.primary.withValues(alpha: 0.08),
+                            onTap: () => _openEditSheet(order: order),
+                          ),
+                        if (_canEditOrder(order)) const SizedBox(width: UiConstants.space2),
                         if (order.confirmedApps.isNotEmpty)
                           _buildHeaderIconButton(
                             icon: _expanded