feat: handle split and merge order with status sync

rahulchaudhary2002 · rahulchaudhary2002 · commit 24a809e552b5 · 2026-05-23T11:17:12.000+05:45
diff --git a/app/Http/Controllers/Orders/OrderController.php b/app/Http/Controllers/Orders/OrderController.php
@@ -118,10 +118,11 @@ public function split(Request $request, Order $order): JsonResponse
         $validated = $request->validate([
             'items'                  => ['required', 'array', 'min:1'],
             'items.*.order_item_id'  => ['required', 'integer'],
-            'items.*.quantity'       => ['required', 'numeric', 'min:0.01'],
+            'items.*.quantity'       => ['required', 'integer', 'min:1'],
+            'dining_table_id'        => ['nullable', 'integer', 'exists:dining_tables,id'],
         ]);
 
-        $newOrder = $this->orderService->splitOrder($order, $validated['items']);
+        $newOrder = $this->orderService->splitOrder($order, $validated['items'], $validated['dining_table_id'] ?? null);
 
         return response()->json([
             'id'           => $newOrder->id,
diff --git a/app/Http/Controllers/PosController.php b/app/Http/Controllers/PosController.php
@@ -121,10 +121,11 @@ public function splitOrder(Request $request, Order $order): JsonResponse
         $validated = $request->validate([
             'items'                 => ['required', 'array', 'min:1'],
             'items.*.order_item_id' => ['required', 'integer'],
-            'items.*.quantity'      => ['required', 'numeric', 'min:0.01'],
+            'items.*.quantity'      => ['required', 'integer', 'min:1'],
+            'dining_table_id'       => ['nullable', 'integer', 'exists:dining_tables,id'],
         ]);
 
-        $newOrder = $this->orderService->splitOrder($order, $validated['items']);
+        $newOrder = $this->orderService->splitOrder($order, $validated['items'], $validated['dining_table_id'] ?? null);
 
         return response()->json([
             'id'           => $newOrder->id,
diff --git a/app/Services/OrderService.php b/app/Services/OrderService.php
@@ -619,7 +619,7 @@ private function autoTransferIngredientsToWarehouse(Warehouse $targetWh, array $
             }
         }
 
-        // Nothing had stock — throw detailed error
+        // Nothing had stock - throw detailed error
         foreach ($deductions as $ingredientId => $deduction) {
             $ingredient = Ingredient::findOrFail((int) $ingredientId);
             $available  = $this->warehouseAvailableStock($targetWh->id, $ingredientId);
@@ -692,9 +692,9 @@ public function sendItemsToKitchen(Order $order): void
         });
     }
 
-    public function splitOrder(Order $order, array $itemSplits): Order
+    public function splitOrder(Order $order, array $itemSplits, ?int $diningTableId = null): Order
     {
-        return DB::transaction(function () use ($order, $itemSplits) {
+        return DB::transaction(function () use ($order, $itemSplits, $diningTableId) {
             abort_if(
                 in_array($order->status, ['completed', 'cancelled']),
                 422,
@@ -740,13 +740,22 @@ public function splitOrder(Order $order, array $itemSplits): Order
                 'updated_by'   => Auth::id(),
             ]);
 
-            foreach ($order->orderTables as $ot) {
+            if ($diningTableId !== null) {
                 OrderTable::create([
                     'order_id'        => $newOrder->id,
-                    'dining_table_id' => $ot->dining_table_id,
-                    'assignment_type' => $ot->assignment_type,
+                    'dining_table_id' => $diningTableId,
+                    'assignment_type' => 'changed_by_staff',
                     'assigned_by'     => Auth::id(),
                 ]);
+            } else {
+                foreach ($order->orderTables as $ot) {
+                    OrderTable::create([
+                        'order_id'        => $newOrder->id,
+                        'dining_table_id' => $ot->dining_table_id,
+                        'assignment_type' => $ot->assignment_type,
+                        'assigned_by'     => Auth::id(),
+                    ]);
+                }
             }
 
             foreach ($itemSplits as $splitData) {
@@ -789,6 +798,13 @@ public function splitOrder(Order $order, array $itemSplits): Order
                 }
             }
 
+            // Derive new order status from its actual items rather than copying parent status
+            $this->syncOrderStatus($newOrder->fresh('items'));
+            $newOrder->refresh();
+
+            $this->syncOrderStatus($order->fresh('items'));
+            $order->refresh();
+
             $this->recordStatusHistory($newOrder, null, $newOrder->status, "Split from order #{$order->order_number}");
             $this->recordStatusHistory($order, $order->status, $order->status, "Items split to new order #{$newOrder->order_number}");
 
@@ -829,9 +845,11 @@ public function mergeOrders(Order $target, array $sourceOrderIds): void
                 ]);
             }
 
+            $this->syncOrderStatus($target->fresh('items'));
+            $target->refresh();
+
             $count = $sourceOrders->count();
             $this->recordStatusHistory($target, $target->status, $target->status, "Merged {$count} order(s) into this order.");
-            $target->touch();
         });
     }
 
@@ -1187,7 +1205,7 @@ private function selectPreparationDepartment(OrderItem $item): OutletDepartment
             }
         }
 
-        // All passes failed — report the specific shortage
+        // All passes failed - report the specific shortage
         $fallback    = $departments->first();
         $fallbackWh  = $this->findDepartmentWarehouse($fallback);
 
@@ -1276,7 +1294,7 @@ private function resolveReservationWarehouse(Order $order, array $deductions): W
         // Use warehouses from the item's preparation department
         $item = null;
 
-        // Determine department from context — caller passes item via order
+        // Determine department from context - caller passes item via order
         // This method is called from reserveOrderItemStock which loads the item
         // We look up the department's warehouses ordered by default first
         $departmentId = null;
diff --git a/resources/js/components/order-split-modal.tsx b/resources/js/components/order-split-modal.tsx
@@ -1,6 +1,7 @@
 import { useState } from 'react';
 import { X, Scissors } from 'lucide-react';
 import { useEscapeKey } from '@/hooks/use-escape-key';
+import { SearchableSelect } from '@/components/ui/searchable-select';
 
 type OrderItem = {
     id: number;
@@ -14,6 +15,12 @@ type OrderItem = {
     addons: { addon: { name: string } | null }[];
 };
 
+type DiningTable = {
+    id: number;
+    name: string;
+    dining_area: { name: string } | null;
+};
+
 type SplitItem = {
     order_item_id: number;
     quantity: number;
@@ -23,19 +30,21 @@ type Props = {
     orderId: number;
     orderNumber: string;
     items: OrderItem[];
+    tables?: DiningTable[];
     onClose: () => void;
-    onSplit: (items: SplitItem[]) => Promise<void>;
+    onSplit: (items: SplitItem[], diningTableId: number | null) => Promise<void>;
     loading?: boolean;
 };
 
-export function OrderSplitModal({ orderId, orderNumber, items, onClose, onSplit, loading }: Props) {
+export function OrderSplitModal({ orderId, orderNumber, items, tables = [], onClose, onSplit, loading }: Props) {
     useEscapeKey(onClose);
 
     const activeItems = items.filter((i) => i.status !== 'cancelled');
     const [selected, setSelected] = useState<Record<number, boolean>>({});
     const [quantities, setQuantities] = useState<Record<number, number>>(() =>
         Object.fromEntries(activeItems.map((i) => [i.id, parseFloat(String(i.quantity))]))
     );
+    const [diningTableId, setDiningTableId] = useState<number | null>(null);
     const [submitting, setSubmitting] = useState(false);
     const [error, setError] = useState<string | null>(null);
 
@@ -46,7 +55,7 @@ export function OrderSplitModal({ orderId, orderNumber, items, onClose, onSplit,
     }
 
     function setQty(id: number, val: number, max: number) {
-        setQuantities((prev) => ({ ...prev, [id]: Math.max(0.01, Math.min(val, max)) }));
+        setQuantities((prev) => ({ ...prev, [id]: Math.max(1, Math.min(Math.floor(val), max)) }));
     }
 
     async function handleSubmit() {
@@ -59,7 +68,7 @@ export function OrderSplitModal({ orderId, orderNumber, items, onClose, onSplit,
         setSubmitting(true);
         setError(null);
         try {
-            await onSplit(splitItems);
+            await onSplit(splitItems, diningTableId);
         } catch (e: any) {
             setError(e?.message ?? 'Split failed.');
         } finally {
@@ -85,8 +94,29 @@ export function OrderSplitModal({ orderId, orderNumber, items, onClose, onSplit,
                 </div>
 
                 {/* Content */}
-                <div className="flex-1 overflow-y-auto p-4 space-y-2">
-                    <p className="text-xs text-muted-foreground mb-3">Select items to move into a new order. The original order keeps the remaining items.</p>
+                <div className="flex-1 overflow-y-auto p-4 space-y-3">
+                    <p className="text-xs text-muted-foreground">Select items to move into a new order. The original order keeps the remaining items.</p>
+
+                    {/* Table selector for new order */}
+                    {tables.length > 0 && (
+                        <div className="rounded-lg border border-border dark:border-stone-700 p-3 space-y-1.5">
+                            <label className="text-xs font-semibold text-foreground">Table for new order</label>
+                            <SearchableSelect
+                                value={diningTableId ?? ''}
+                                placeholder="Same as original order"
+                                onChange={(e) => setDiningTableId(e.target.value ? Number(e.target.value) : null)}
+                            >
+                                <option value="">Same as original order</option>
+                                {tables.map((t) => (
+                                    <option key={t.id} value={t.id}>
+                                        {t.dining_area ? `${t.dining_area.name} - ` : ''}{t.name}
+                                    </option>
+                                ))}
+                            </SearchableSelect>
+                        </div>
+                    )}
+
+                    {/* Items */}
                     {activeItems.map((item) => {
                         const max = parseFloat(String(item.quantity));
                         const isSelected = !!selected[item.id];
@@ -121,7 +151,7 @@ export function OrderSplitModal({ orderId, orderNumber, items, onClose, onSplit,
                                             <span className="text-xs text-muted-foreground">Qty to split:</span>
                                             <input
                                                 type="number"
-                                                min="0.01"
+                                                min="1"
                                                 max={max}
                                                 step="1"
                                                 value={quantities[item.id]}
@@ -143,20 +173,20 @@ export function OrderSplitModal({ orderId, orderNumber, items, onClose, onSplit,
                 <div className="border-t border-border dark:border-stone-800 px-4 py-3 flex flex-col gap-2">
                     {error && <p className="text-xs text-red-500">{error}</p>}
                     <div className="flex items-center justify-between gap-3">
-                    <span className="text-xs text-muted-foreground">{selectedCount} item{selectedCount !== 1 ? 's' : ''} selected</span>
-                    <div className="flex gap-2">
-                        <button type="button" onClick={onClose} className="rounded-lg border border-border px-3 py-1.5 text-xs font-semibold hover:bg-muted dark:border-stone-700">
-                            Cancel
-                        </button>
-                        <button
-                            type="button"
-                            onClick={handleSubmit}
-                            disabled={selectedCount === 0 || submitting}
-                            className="rounded-lg bg-primary px-3 py-1.5 text-xs font-bold text-white disabled:opacity-50 hover:opacity-90"
-                        >
-                            {submitting ? 'Splitting...' : 'Split Order'}
-                        </button>
-                    </div>
+                        <span className="text-xs text-muted-foreground">{selectedCount} item{selectedCount !== 1 ? 's' : ''} selected</span>
+                        <div className="flex gap-2">
+                            <button type="button" onClick={onClose} className="rounded-lg border border-border px-3 py-1.5 text-xs font-semibold hover:bg-muted dark:border-stone-700">
+                                Cancel
+                            </button>
+                            <button
+                                type="button"
+                                onClick={handleSubmit}
+                                disabled={selectedCount === 0 || submitting}
+                                className="rounded-lg bg-primary px-3 py-1.5 text-xs font-bold text-white disabled:opacity-50 hover:opacity-90"
+                            >
+                                {submitting ? 'Splitting...' : 'Split Order'}
+                            </button>
+                        </div>
                     </div>
                 </div>
             </div>
diff --git a/resources/js/pages/orders/items.tsx b/resources/js/pages/orders/items.tsx
@@ -489,7 +489,7 @@ export default function OrderItemsIndex({ items, outlets, departments, filters }
 
                                         {/* Department */}
                                         <td className="px-6 py-4 text-sm text-muted-foreground dark:text-stone-400">
-                                            {item.preparation_department?.name ?? '—'}
+                                            {item.preparation_department?.name ?? '-'}
                                         </td>
 
                                         {/* Qty */}
@@ -524,7 +524,7 @@ export default function OrderItemsIndex({ items, outlets, departments, filters }
                                                         {isUpdating ? '…' : ITEM_NEXT_LABEL[item.status]}
                                                     </button>
                                                 ) : (
-                                                    <span className="text-xs text-muted-foreground dark:text-stone-500">—</span>
+                                                    <span className="text-xs text-muted-foreground dark:text-stone-500">-</span>
                                                 )}
                                             </td>
                                         )}
diff --git a/resources/js/pages/orders/show.tsx b/resources/js/pages/orders/show.tsx
@@ -659,9 +659,15 @@ export default function OrdersShow({ order, availableFoods, availableTables, dep
                                         {isActive && item.status !== 'cancelled' && item.status !== 'served' && can('order-items-update') && ITEM_NEXT_STATUS[item.status] && (
                                             <div className="mt-2">
                                                 <button
-                                                    onClick={() => {
+                                                    onClick={async () => {
                                                         const next = ITEM_NEXT_STATUS[item.status]!;
-                                                        router.patch(`/orders/${order.id}/items/${item.id}/status`, { status: next });
+                                                        const csrf = (document.querySelector('meta[name="csrf-token"]') as HTMLMetaElement | null)?.content ?? '';
+                                                        await fetch(`/orders/${order.id}/items/${item.id}/status`, {
+                                                            method: 'PATCH',
+                                                            headers: { 'Content-Type': 'application/json', Accept: 'application/json', 'X-CSRF-TOKEN': csrf },
+                                                            body: JSON.stringify({ status: next }),
+                                                        });
+                                                        router.reload({ only: ['order'] });
                                                     }}
                                                     className={`inline-flex items-center gap-1 rounded-lg px-2.5 py-1 text-[11px] font-bold transition hover:opacity-80 ring-1 ${ITEM_STATUS_COLORS[ITEM_NEXT_STATUS[item.status]!] ?? ''}`}
                                                 >
@@ -872,7 +878,7 @@ export default function OrdersShow({ order, availableFoods, availableTables, dep
                                 <p className="mt-0.5 text-xs text-muted-foreground">
                                     Qty: {transferItem.quantity} · Current:{' '}
                                     <span className="font-medium text-foreground dark:text-stone-200">
-                                        {transferItem.preparation_department?.name ?? '—'}
+                                        {transferItem.preparation_department?.name ?? '-'}
                                     </span>
                                 </p>
                             </div>
diff --git a/resources/js/pages/pos/index.tsx b/resources/js/pages/pos/index.tsx
