+ */
+ public function getMenuItems(): Collection
+ {
+ return $this->menuItems;
+ }
public function addMenuItem(MenuItem $menuItem): static
{
if (! $this->menuItems->contains($menuItem)) {
$this->menuItems->add($menuItem);
- $menuItem->vendor = $this;
+ $menuItem->setVendor($this);
}
return $this;
@@ -48,29 +74,11 @@ class Vendor
public function removeMenuItem(MenuItem $menuItem): static
{
// set the owning side to null (unless already changed)
- if ($this->menuItems->removeElement($menuItem) && $menuItem->vendor === $this) {
- $menuItem->vendor = null;
- }
-
- return $this;
- }
-
- public function addFoodOrder(FoodOrder $foodOrder): static
- {
- if (! $this->foodOrders->contains($foodOrder)) {
- $this->foodOrders->add($foodOrder);
- $foodOrder->vendor = $this;
- }
-
- return $this;
- }
-
- public function removeFoodOrder(FoodOrder $foodOrder): static
- {
if (
- $this->foodOrders->removeElement($foodOrder) && $foodOrder->vendor === $this
+ $this->menuItems->removeElement($menuItem)
+ && $menuItem->getVendor() === $this
) {
- $foodOrder->vendor = null;
+ $menuItem->setVendor(null);
}
return $this;
diff --git a/src/Form/FoodOrderType.php b/src/Form/FoodOrderType.php
index c6202b6..4f4af00 100644
--- a/src/Form/FoodOrderType.php
+++ b/src/Form/FoodOrderType.php
@@ -2,21 +2,29 @@
namespace App\Form;
+use App\Service\WhoAreYou;
use App\Entity\FoodOrder;
use App\Entity\Vendor;
use Override;
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
class FoodOrderType extends AbstractType
{
+ public function __construct(
+ private readonly WhoAreYou $who
+ ) {}
+
#[Override]
public function buildForm(FormBuilderInterface $builder, array $options): void
{
$builder
- ->add('startedByName')
+ ->add('startedBy', TextType::class, [
+ 'data' => $this->who->username,
+ ])
->add(
'vendor',
EntityType::class,
diff --git a/src/Form/OrderItemType.php b/src/Form/OrderItemType.php
new file mode 100644
index 0000000..2e3288f
--- /dev/null
+++ b/src/Form/OrderItemType.php
@@ -0,0 +1,35 @@
+add('foodOrder', EntityType::class, [
+ 'class' => FoodOrder::class,
+'choice_label' => 'id',
+ ])
+ ->add('menuItem', EntityType::class, [
+ 'class' => MenuItem::class,
+'choice_label' => 'id',
+ ])
+ ;
+ }
+
+ public function configureOptions(OptionsResolver $resolver): void
+ {
+ $resolver->setDefaults([
+ 'data_class' => OrderItem::class,
+ ]);
+ }
+}
diff --git a/src/Repository/FoodOrderRepository.php b/src/Repository/FoodOrderRepository.php
index 5425e2f..72e2547 100644
--- a/src/Repository/FoodOrderRepository.php
+++ b/src/Repository/FoodOrderRepository.php
@@ -1,12 +1,10 @@
-
+ * @return FoodOrder[] Returns an array of FoodOrder objects
*/
- public function findOpen(int $limit = 10): Collection
+ public function findOpenOrders(): array
{
- $yesterday = new DateTime;
- $yesterday->modify('-1 day');
- $queryBuilder = $this->createQueryBuilder('e');
- $queryBuilder
- ->where('e.closedAt IS NULL')
- ->andWhere($queryBuilder->expr()->gte('e.startedAt', ':yesterday'))
- ->setParameter('yesterday', $yesterday);
- return new ArrayCollection($queryBuilder->getQuery()->getResult());
+ return $this->createQueryBuilder('f')
+ ->andWhere('f.closedAt IS NULL')
+ ->getQuery()
+ ->getResult();
}
}
diff --git a/src/Repository/MenuItemRepository.php b/src/Repository/MenuItemRepository.php
index 06ca4c5..43bdddd 100644
--- a/src/Repository/MenuItemRepository.php
+++ b/src/Repository/MenuItemRepository.php
@@ -1,4 +1,5 @@
-username = $appVariable->getRequest()?->cookies?->get('username', '')
+ ?? '';
+ }
+
+ public function isKnown(): bool
+ {
+ return $this->username !== '';
+ }
+
+ #[Override]
+ public function __toString(): string
+ {
+ return $this->username;
+ }
+}
diff --git a/src/Twig/AppExtension.php b/src/Twig/AppExtension.php
new file mode 100644
index 0000000..09ebefe
--- /dev/null
+++ b/src/Twig/AppExtension.php
@@ -0,0 +1,26 @@
+formatCentsToEur(...))];
+ }
+
+ public function formatCentsToEur(int $cents): string
+ {
+ $euros = $cents / 100;
+ return number_format($euros, 2, ',', '') . ' EUR';
+ }
+}
diff --git a/symfony.lock b/symfony.lock
index 62233e3..05fb1aa 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -25,19 +25,6 @@
"src/DataFixtures/AppFixtures.php"
]
},
- "doctrine/doctrine-migrations-bundle": {
- "version": "3.3",
- "recipe": {
- "repo": "github.com/symfony/recipes",
- "branch": "main",
- "version": "3.1",
- "ref": "1d01ec03c6ecbd67c3375c5478c9a423ae5d6a33"
- },
- "files": [
- "config/packages/doctrine_migrations.yaml",
- "migrations/.gitignore"
- ]
- },
"phpstan/phpstan": {
"version": "1.10",
"recipe": {
@@ -99,15 +86,6 @@
"src/Kernel.php"
]
},
- "symfony/maker-bundle": {
- "version": "1.53",
- "recipe": {
- "repo": "github.com/symfony/recipes",
- "branch": "main",
- "version": "1.0",
- "ref": "fadbfe33303a76e25cb63401050439aa9b1a9c7f"
- }
- },
"symfony/routing": {
"version": "7.0",
"recipe": {
diff --git a/templates/base.html.twig b/templates/base.html.twig
index ecdca20..57a74af 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -4,7 +4,7 @@
{% block title %}Welcome!{% endblock %}
-
+
{% block stylesheets %}
{% endblock %}
@@ -12,6 +12,15 @@
{% endblock %}
- {% block body %}{% endblock %}
+
+
+ {% block body %}{% endblock %}
+