diff --git a/assets/javascript/emoji-footprint.js b/assets/javascript/emoji-footprint.js index 8e29ae0..434300b 100644 --- a/assets/javascript/emoji-footprint.js +++ b/assets/javascript/emoji-footprint.js @@ -1,10 +1,13 @@ // Sparkle effect on mouse move document.addEventListener('mousemove', function (e) { - let emojis = ['âš', 'đ', 'đ', 'đ ', 'đŠ', 'đ', 'đ']; const htmlElement = document.documentElement; + if (htmlElement.getAttribute('data-website-mode') === 'normal') { + return; + } + let emojis = ['âš', 'đ', 'đ', 'đ ', 'đŠ', 'đ', 'đ']; if (htmlElement.getAttribute('data-website-mode') === 'mono') { - emojis = ['đŠ', 'đŠč', 'đ', 'â°ïž', 'đŻïž']; + emojis = ['đŠ', 'đŠ', 'đŠ', 'đŠĄ', 'đș', '', '', '', '', '', '', '', '', '', '']; } const sparkle = document.createElement('div'); sparkle.className = 'emoji-footprint'; diff --git a/src/Controller/HomeController.php b/src/Controller/HomeController.php index 46c90c7..bf6a72d 100644 --- a/src/Controller/HomeController.php +++ b/src/Controller/HomeController.php @@ -3,6 +3,7 @@ namespace App\Controller; use App\Form\UserNameFormType; +use DateTimeImmutable; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Cookie; use Symfony\Component\HttpFoundation\RedirectResponse; @@ -33,7 +34,13 @@ final class HomeController extends AbstractController $response->headers->clearCookie('username'); return $response; } - $response->headers->setCookie(new Cookie('username', $username)); + $response->headers->setCookie( + new Cookie( + name: 'username', + value: $username, + expire: new DateTimeImmutable('+1 year'), + ) + ); return $response; } $username = $request->cookies->get('username', self::DEFAULT_USERNAME); diff --git a/src/Entity/OrderItem.php b/src/Entity/OrderItem.php index e91c1c0..d3741da 100644 --- a/src/Entity/OrderItem.php +++ b/src/Entity/OrderItem.php @@ -130,6 +130,9 @@ class OrderItem public function setMenuItem(MenuItem|null $menuItem): static { + if (! $menuItem instanceof MenuItem) { + return $this; + } $this->menuItem = $menuItem; $this->name = $menuItem->getName(); 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/food_order/show.html.twig b/templates/food_order/show.html.twig index 44b5d7a..dbd9375 100644 --- a/templates/food_order/show.html.twig +++ b/templates/food_order/show.html.twig @@ -65,11 +65,7 @@ {% for itemForm in form.orderItems %}