finish

src/Controller/DrinkTypeBulkController.php

@@ -57,6 +57,7 @@ final class DrinkTypeBulkController extends AbstractController
         EntityManagerInterface $entityManager
     ): Response {
         $drinkTypes = $drinkTypeRepository->findAll();
+        $fromOrder = $request->query->get('from_order') === 'true';
 
         $form = $this->createForm(BulkEditDrinkTypeWantedStockForm::class, [
             'drinkTypes' => $drinkTypes,
@@ -75,12 +76,22 @@ final class DrinkTypeBulkController extends AbstractController
 
             $this->addFlash('success', 'Wanted stock levels updated successfully!');
 
+            if ($fromOrder) {
+                return $this->redirectToRoute('app_order_new');
+            }
+
             return $this->redirectToRoute('app_drink_type_bulk_edit_wanted_stock');
         }
 
+        // Handle skip button
+        if ($request->query->has('skip') && $fromOrder) {
+            return $this->redirectToRoute('app_order_new');
+        }
+
         return $this->render('drink_type/bulk_edit_wanted_stock.html.twig', [
             'form' => $form->createView(),
             'drinkTypes' => $drinkTypes,
+            'from_order' => $fromOrder,
         ]);
     }
 }

src/Controller/Index.php

@@ -23,7 +23,7 @@ final class Index extends AbstractController
         $lowStock = $filterLowStockDrinks($wanted);
         $orders = $orderService->getActiveOrders();
         return $this->render('index.html.twig', [
-            'drinkTypes' => $lowStock,
+            'drinkTypes' => $wanted,
             'lowStock' => $lowStock,
             'orders' => $orders,
         ]);

src/Entity/Order.php

@@ -44,7 +44,6 @@ class Order
         $this->createdAt = new DateTimeImmutable();
         $this->updatedAt = new DateTimeImmutable();
         $this->orderItems = new ArrayCollection();
-        $this->status = OrderStatus::NEW;
     }
 
     public function getId(): null|int

src/Form/OrderForm.php

@@ -17,10 +17,14 @@ class OrderForm extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
-            ->add('status', EnumType::class, ['class' => OrderStatus::class])
+            ->add('status', EnumType::class, [
+                'class' => OrderStatus::class,
+            ])
             ->add('orderItems', CollectionType::class, [
                 'entry_type' => OrderItemType::class,
-                'entry_options' => ['label' => false],
+                'entry_options' => [
+                    'label' => false,
+                ],
                 'allow_add' => true,
                 'allow_delete' => true,
                 'by_reference' => false,