diff --git a/lib/presentation/home/bloc/order_form/order_form_bloc.dart b/lib/presentation/home/bloc/order_form/order_form_bloc.dart
index 77f91b5..7c31645 100644
--- a/lib/presentation/home/bloc/order_form/order_form_bloc.dart
+++ b/lib/presentation/home/bloc/order_form/order_form_bloc.dart
@@ -35,8 +35,8 @@ class OrderFormBloc extends Bloc<OrderFormEvent, OrderFormState> {
             customerName: event.customerName,
             notes: '',
             orderType: event.orderType.name,
-            tableId: event.table.id,
-            tableNumber: event.table.tableName,
+            tableId: event.table?.id,
+            tableNumber: event.table?.tableName,
             outletId: userData.user?.outletId,
             customerId: event.customer?.id ?? '',
             orderItems: event.items
diff --git a/lib/presentation/home/bloc/order_form/order_form_bloc.freezed.dart b/lib/presentation/home/bloc/order_form/order_form_bloc.freezed.dart
index ae4f32f..c2c49bc 100644
--- a/lib/presentation/home/bloc/order_form/order_form_bloc.freezed.dart
+++ b/lib/presentation/home/bloc/order_form/order_form_bloc.freezed.dart
@@ -20,7 +20,7 @@ mixin _$OrderFormEvent {
   TResult when<TResult extends Object?>({
     required TResult Function(Order order) started,
     required TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)
+            Customer? customer, OrderType orderType, TableModel? table)
         create,
     required TResult Function(
             List<ProductQuantity> items,
@@ -46,7 +46,7 @@ mixin _$OrderFormEvent {
   TResult? whenOrNull<TResult extends Object?>({
     TResult? Function(Order order)? started,
     TResult? Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult? Function(
             List<ProductQuantity> items,
@@ -69,7 +69,7 @@ mixin _$OrderFormEvent {
   TResult maybeWhen<TResult extends Object?>({
     TResult Function(Order order)? started,
     TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult Function(
             List<ProductQuantity> items,
@@ -219,7 +219,7 @@ class _$StartedImpl implements _Started {
   TResult when<TResult extends Object?>({
     required TResult Function(Order order) started,
     required TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)
+            Customer? customer, OrderType orderType, TableModel? table)
         create,
     required TResult Function(
             List<ProductQuantity> items,
@@ -248,7 +248,7 @@ class _$StartedImpl implements _Started {
   TResult? whenOrNull<TResult extends Object?>({
     TResult? Function(Order order)? started,
     TResult? Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult? Function(
             List<ProductQuantity> items,
@@ -274,7 +274,7 @@ class _$StartedImpl implements _Started {
   TResult maybeWhen<TResult extends Object?>({
     TResult Function(Order order)? started,
     TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult Function(
             List<ProductQuantity> items,
@@ -372,7 +372,7 @@ abstract class _$$CreateImplCopyWith<$Res> {
       String customerName,
       Customer? customer,
       OrderType orderType,
-      TableModel table});
+      TableModel? table});
 }
 
 /// @nodoc
@@ -392,7 +392,7 @@ class __$$CreateImplCopyWithImpl<$Res>
     Object? customerName = null,
     Object? customer = freezed,
     Object? orderType = null,
-    Object? table = null,
+    Object? table = freezed,
   }) {
     return _then(_$CreateImpl(
       items: null == items
@@ -411,10 +411,10 @@ class __$$CreateImplCopyWithImpl<$Res>
           ? _value.orderType
           : orderType // ignore: cast_nullable_to_non_nullable
               as OrderType,
-      table: null == table
+      table: freezed == table
           ? _value.table
           : table // ignore: cast_nullable_to_non_nullable
-              as TableModel,
+              as TableModel?,
     ));
   }
 }
@@ -445,7 +445,7 @@ class _$CreateImpl implements _Create {
   @override
   final OrderType orderType;
   @override
-  final TableModel table;
+  final TableModel? table;
 
   @override
   String toString() {
@@ -489,7 +489,7 @@ class _$CreateImpl implements _Create {
   TResult when<TResult extends Object?>({
     required TResult Function(Order order) started,
     required TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)
+            Customer? customer, OrderType orderType, TableModel? table)
         create,
     required TResult Function(
             List<ProductQuantity> items,
@@ -518,7 +518,7 @@ class _$CreateImpl implements _Create {
   TResult? whenOrNull<TResult extends Object?>({
     TResult? Function(Order order)? started,
     TResult? Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult? Function(
             List<ProductQuantity> items,
@@ -544,7 +544,7 @@ class _$CreateImpl implements _Create {
   TResult maybeWhen<TResult extends Object?>({
     TResult Function(Order order)? started,
     TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult Function(
             List<ProductQuantity> items,
@@ -625,13 +625,13 @@ abstract class _Create implements OrderFormEvent {
       required final String customerName,
       required final Customer? customer,
       required final OrderType orderType,
-      required final TableModel table}) = _$CreateImpl;
+      required final TableModel? table}) = _$CreateImpl;
 
   List<ProductQuantity> get items;
   String get customerName;
   Customer? get customer;
   OrderType get orderType;
-  TableModel get table;
+  TableModel? get table;
 
   /// Create a copy of OrderFormEvent
   /// with the given fields replaced by the non-null parameter values.
@@ -783,7 +783,7 @@ class _$CreateWithPaymentMethodImpl implements _CreateWithPaymentMethod {
   TResult when<TResult extends Object?>({
     required TResult Function(Order order) started,
     required TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)
+            Customer? customer, OrderType orderType, TableModel? table)
         create,
     required TResult Function(
             List<ProductQuantity> items,
@@ -813,7 +813,7 @@ class _$CreateWithPaymentMethodImpl implements _CreateWithPaymentMethod {
   TResult? whenOrNull<TResult extends Object?>({
     TResult? Function(Order order)? started,
     TResult? Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult? Function(
             List<ProductQuantity> items,
@@ -840,7 +840,7 @@ class _$CreateWithPaymentMethodImpl implements _CreateWithPaymentMethod {
   TResult maybeWhen<TResult extends Object?>({
     TResult Function(Order order)? started,
     TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult Function(
             List<ProductQuantity> items,
@@ -1027,7 +1027,7 @@ class _$AddToOrderImpl implements _AddToOrder {
   TResult when<TResult extends Object?>({
     required TResult Function(Order order) started,
     required TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)
+            Customer? customer, OrderType orderType, TableModel? table)
         create,
     required TResult Function(
             List<ProductQuantity> items,
@@ -1056,7 +1056,7 @@ class _$AddToOrderImpl implements _AddToOrder {
   TResult? whenOrNull<TResult extends Object?>({
     TResult? Function(Order order)? started,
     TResult? Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult? Function(
             List<ProductQuantity> items,
@@ -1082,7 +1082,7 @@ class _$AddToOrderImpl implements _AddToOrder {
   TResult maybeWhen<TResult extends Object?>({
     TResult Function(Order order)? started,
     TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult Function(
             List<ProductQuantity> items,
@@ -1269,7 +1269,7 @@ class _$RefundImpl implements _Refund {
   TResult when<TResult extends Object?>({
     required TResult Function(Order order) started,
     required TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)
+            Customer? customer, OrderType orderType, TableModel? table)
         create,
     required TResult Function(
             List<ProductQuantity> items,
@@ -1298,7 +1298,7 @@ class _$RefundImpl implements _Refund {
   TResult? whenOrNull<TResult extends Object?>({
     TResult? Function(Order order)? started,
     TResult? Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult? Function(
             List<ProductQuantity> items,
@@ -1324,7 +1324,7 @@ class _$RefundImpl implements _Refund {
   TResult maybeWhen<TResult extends Object?>({
     TResult Function(Order order)? started,
     TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult Function(
             List<ProductQuantity> items,
@@ -1513,7 +1513,7 @@ class _$VoidOrderImpl implements _VoidOrder {
   TResult when<TResult extends Object?>({
     required TResult Function(Order order) started,
     required TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)
+            Customer? customer, OrderType orderType, TableModel? table)
         create,
     required TResult Function(
             List<ProductQuantity> items,
@@ -1542,7 +1542,7 @@ class _$VoidOrderImpl implements _VoidOrder {
   TResult? whenOrNull<TResult extends Object?>({
     TResult? Function(Order order)? started,
     TResult? Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult? Function(
             List<ProductQuantity> items,
@@ -1568,7 +1568,7 @@ class _$VoidOrderImpl implements _VoidOrder {
   TResult maybeWhen<TResult extends Object?>({
     TResult Function(Order order)? started,
     TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult Function(
             List<ProductQuantity> items,
@@ -1730,7 +1730,7 @@ class _$ToggleItemImpl implements _ToggleItem {
   TResult when<TResult extends Object?>({
     required TResult Function(Order order) started,
     required TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)
+            Customer? customer, OrderType orderType, TableModel? table)
         create,
     required TResult Function(
             List<ProductQuantity> items,
@@ -1759,7 +1759,7 @@ class _$ToggleItemImpl implements _ToggleItem {
   TResult? whenOrNull<TResult extends Object?>({
     TResult? Function(Order order)? started,
     TResult? Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult? Function(
             List<ProductQuantity> items,
@@ -1785,7 +1785,7 @@ class _$ToggleItemImpl implements _ToggleItem {
   TResult maybeWhen<TResult extends Object?>({
     TResult Function(Order order)? started,
     TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult Function(
             List<ProductQuantity> items,
@@ -1944,7 +1944,7 @@ class _$ToggleSelectAllImpl implements _ToggleSelectAll {
   TResult when<TResult extends Object?>({
     required TResult Function(Order order) started,
     required TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)
+            Customer? customer, OrderType orderType, TableModel? table)
         create,
     required TResult Function(
             List<ProductQuantity> items,
@@ -1973,7 +1973,7 @@ class _$ToggleSelectAllImpl implements _ToggleSelectAll {
   TResult? whenOrNull<TResult extends Object?>({
     TResult? Function(Order order)? started,
     TResult? Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult? Function(
             List<ProductQuantity> items,
@@ -1999,7 +1999,7 @@ class _$ToggleSelectAllImpl implements _ToggleSelectAll {
   TResult maybeWhen<TResult extends Object?>({
     TResult Function(Order order)? started,
     TResult Function(List<ProductQuantity> items, String customerName,
-            Customer? customer, OrderType orderType, TableModel table)?
+            Customer? customer, OrderType orderType, TableModel? table)?
         create,
     TResult Function(
             List<ProductQuantity> items,
diff --git a/lib/presentation/home/bloc/order_form/order_form_event.dart b/lib/presentation/home/bloc/order_form/order_form_event.dart
index 1db4c26..63a6a61 100644
--- a/lib/presentation/home/bloc/order_form/order_form_event.dart
+++ b/lib/presentation/home/bloc/order_form/order_form_event.dart
@@ -8,7 +8,7 @@ class OrderFormEvent with _$OrderFormEvent {
     required String customerName,
     required Customer? customer,
     required OrderType orderType,
-    required TableModel table,
+    required TableModel? table,
   }) = _Create;
   const factory OrderFormEvent.createWithPayment({
     required List<ProductQuantity> items,
diff --git a/lib/presentation/home/pages/confirm_payment_page.dart b/lib/presentation/home/pages/confirm_payment_page.dart
index 74b14f4..7dd6603 100644
--- a/lib/presentation/home/pages/confirm_payment_page.dart
+++ b/lib/presentation/home/pages/confirm_payment_page.dart
@@ -921,7 +921,7 @@ class _ConfirmPaymentPageState extends State<ConfirmPaymentPage> {
                                                           customerController
                                                               .text,
                                                       orderType: orderType,
-                                                      table: widget.table!,
+                                                      table: widget.table,
                                                       customer:
                                                           selectedCustomer,
                                                     ),