diff --git a/src/Form/OrderItemFinalize.php b/src/Form/OrderItemFinalize.php index fbe285d..f4627a9 100644 --- a/src/Form/OrderItemFinalize.php +++ b/src/Form/OrderItemFinalize.php @@ -5,7 +5,6 @@ namespace App\Form; use App\Entity\OrderItem; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\CheckboxType; -use Symfony\Component\Form\Extension\Core\Type\HiddenType; use Symfony\Component\Form\Extension\Core\Type\MoneyType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; @@ -22,8 +21,6 @@ final class OrderItemFinalize extends AbstractType ->add(child: 'extras', options: [ 'disabled' => true, ]) - ->add(child: 'menuItem', type: HiddenType::class, options: [ - ]) ->add(child: 'createdBy', options: [ 'disabled' => true, ]) diff --git a/templates/base.html.twig b/templates/base.html.twig index 75fae8c..fa07f9b 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -12,7 +12,7 @@
-
-
+
{% block body %}{% endblock %}
diff --git a/templates/food_order/show.html.twig b/templates/food_order/show.html.twig index 44b5d7a..b44a3f2 100644 --- a/templates/food_order/show.html.twig +++ b/templates/food_order/show.html.twig @@ -65,11 +65,7 @@ {% for itemForm in form.orderItems %} {{ field_value(itemForm.createdBy) }} - - - {{ field_value(itemForm.name) }} - - + {{ field_value(itemForm.name) }} {{ field_value(itemForm.extras) }} {{ form_widget(itemForm.priceCents) }} {{ form_widget(itemForm.isPaid) }} @@ -99,9 +95,7 @@ {{ loop.index }} {{ item.createdBy }} - - {{ item.name }} - + {{ item.name }} {{ item.extras }} {% if(food_order.isClosed) %} diff --git a/templates/food_vendor/show.html.twig b/templates/food_vendor/show.html.twig index e87b0e7..51c7e6d 100644 --- a/templates/food_vendor/show.html.twig +++ b/templates/food_vendor/show.html.twig @@ -20,27 +20,16 @@

known menuitems

- - - - - - - - + - - - + {% endfor %} - -
nameprice
+
diff --git a/tests/Feature/Controller/FoodVendorControllerTest.php b/tests/Feature/Controller/FoodVendorControllerTest.php index 8b2a264..8761330 100644 --- a/tests/Feature/Controller/FoodVendorControllerTest.php +++ b/tests/Feature/Controller/FoodVendorControllerTest.php @@ -119,7 +119,7 @@ describe(FoodVendorController::class, function (): void { )->text(); $this->assertSame('My Title', $nameNode); - $itemNodes = $crawler->filter('tr.menu-item'); + $itemNodes = $crawler->filter('ul.list-group li.list-group-item'); $this->assertCount(4, $itemNodes); });