diff --git a/config/bundles.php b/config/bundles.php
index 39f8515..d133787 100644
--- a/config/bundles.php
+++ b/config/bundles.php
@@ -1,10 +1,32 @@
 <?php
 
+declare(strict_types=1);
+
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+use Symfony\Bundle\TwigBundle\TwigBundle;
+use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
+use Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle;
+use Symfony\Bundle\MakerBundle\MakerBundle;
+use Symfony\Bundle\WebProfilerBundle\WebProfilerBundle;
+
 return [
-    Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
-    Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
-    Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
-    Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle::class => ['all' => true],
-    Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true],
-    Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
+    FrameworkBundle::class => [
+        'all' => true,
+    ],
+    TwigBundle::class => [
+        'all' => true,
+    ],
+    DoctrineBundle::class => [
+        'all' => true,
+    ],
+    DoctrineMigrationsBundle::class => [
+        'all' => true,
+    ],
+    MakerBundle::class => [
+        'dev' => true,
+    ],
+    WebProfilerBundle::class => [
+        'dev' => true,
+        'test' => true,
+    ],
 ];
diff --git a/config/packages/twig.php b/config/packages/twig.php
index 70a0438..d992c86 100644
--- a/config/packages/twig.php
+++ b/config/packages/twig.php
@@ -6,10 +6,12 @@ use App\Service\Config\AppName;
 use Symfony\Config\TwigConfig;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
+use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
+
 return static function (ContainerConfigurator $containerConfigurator, TwigConfig $twig): void {
     $twig->fileNamePattern('*.twig');
-    $twig->formThemes(['bootstrap_5_layout.html.twig']);
-    $twig->global('appName', \Symfony\Component\DependencyInjection\Loader\Configurator\service(AppName::class));
+    $twig->formThemes(['form/theme.html.twig']);
+    $twig->global('appName', service(AppName::class));
     if ($containerConfigurator->env() === 'test') {
         $twig->strictVariables(true);
     }
diff --git a/config/services.php b/config/services.php
index 853aaff..6168c78 100644
--- a/config/services.php
+++ b/config/services.php
@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+use Doctrine\ORM\Events;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
@@ -15,5 +16,4 @@ return static function (ContainerConfigurator $containerConfigurator): void {
 
     $services->load('App\\Service\\', __DIR__ . '/../src/Service')
         ->public();
-
 };
diff --git a/public/assets/js/app.js b/public/assets/js/app.js
index 0a4f96b..0d612f3 100644
--- a/public/assets/js/app.js
+++ b/public/assets/js/app.js
@@ -13,785 +13,115 @@ document.addEventListener('mousemove', function (e) {
     }, 1000);
 });
 
-// Dashboard, Order Management, Inventory Management, Settings, and Drink Type functionality
+// Function to initialize number input buttons
+function initNumberInputs(container = document) {
+    container.querySelectorAll('.number-input-wrapper').forEach(function(wrapper) {
+        const input = wrapper.querySelector('input[type="number"]');
+        const decreaseBtn = wrapper.querySelector('[data-action="decrease"]');
+        const increaseBtn = wrapper.querySelector('[data-action="increase"]');
+
+        if (!input || !decreaseBtn || !increaseBtn) return;
+
+        // Skip if already initialized
+        if (decreaseBtn.hasAttribute('data-initialized')) return;
+
+        const step = parseFloat(input.getAttribute('step')) || 1;
+        const min = 0;
+        const max = input.getAttribute('max') ? parseFloat(input.getAttribute('max')) : null;
+
+        decreaseBtn.addEventListener('click', function() {
+            const currentValue = parseFloat(input.value) || 0;
+            const newValue = currentValue - step;
+
+            if (min === null || newValue >= min) {
+                input.value = newValue;
+                input.dispatchEvent(new Event('change', { bubbles: true }));
+            }
+        });
+
+        increaseBtn.addEventListener('click', function() {
+            const currentValue = parseFloat(input.value) || 0;
+            const newValue = currentValue + step;
+
+            if (max === null || newValue <= max) {
+                input.value = newValue;
+                input.dispatchEvent(new Event('change', { bubbles: true }));
+            }
+        });
+
+        // Validate input on change
+        input.addEventListener('input', function() {
+            const value = parseFloat(this.value);
+
+            if (min !== null && value < min) {
+                this.value = min;
+            }
+            if (max !== null && value > max) {
+                this.value = max;
+            }
+        });
+
+        // Mark as initialized
+        decreaseBtn.setAttribute('data-initialized', 'true');
+        increaseBtn.setAttribute('data-initialized', 'true');
+    });
+}
+
 document.addEventListener('DOMContentLoaded', function() {
-    // Stock update form handling
-    initStockUpdateForms();
+    // Bootstrap Modal handling
+    const htmxModal = document.getElementById('htmxModal');
+    if (htmxModal) {
+        htmxModal.addEventListener('show.bs.modal', function(event) {
+            // Get the button that triggered the modal
+            const button = event.relatedTarget;
+            // Extract the drink name from data-* attributes
+            const drinkName = button.getAttribute('data-drink-name');
+            // Update the modal title
+            if (drinkName) {
+                const modalTitle = htmxModal.querySelector('.modal-title');
+                if (modalTitle) {
+                    modalTitle.textContent = 'Update Stock for ' + drinkName;
+                }
+            }
+        });
+    }
 
-    // Edit button handling
-    initEditButtons();
+    // HTMX Modal handling
+    document.body.addEventListener('htmx:afterSwap', function(event) {
+        // If the target is the modal body, initialize any form elements inside it
+        if (event.detail.target.id === 'htmxModalBody') {
+            // The modal content has been loaded
+            console.log('Modal content loaded');
+            // Initialize number inputs in the modal
+            initNumberInputs(event.detail.target);
+        }
+    });
 
-    // Order form handling
-    initOrderForms();
+    // Handle form submissions in the modal
+    document.body.addEventListener('htmx:beforeSend', function(event) {
+        // If the event is from a form inside the modal
+        if (event.detail.elt.closest('#htmxModalBody')) {
+            // Add the HX-Request header to the request
+            event.detail.requestConfig.headers['HX-Request'] = 'true';
+        }
+    });
 
-    // Order status form handling
-    initOrderStatusForms();
+    // Handle redirects from HTMX
+    document.body.addEventListener('htmx:responseError', function(event) {
+        if (event.detail.xhr.status === 303) {
+            const redirectUrl = event.detail.xhr.getResponseHeader('HX-Redirect');
+            if (redirectUrl) {
+                // Close the modal
+                const modal = bootstrap.Modal.getInstance(document.getElementById('htmxModal'));
+                if (modal) {
+                    modal.hide();
+                }
+                // Redirect to the specified URL
+                window.location.href = redirectUrl;
+            }
+        }
+    });
 
-    // Inventory form handling
-    initInventoryForm();
-
-    // Settings form handling
-    initSettingsForm();
-
-    // Drink Type form handling
-    initDrinkTypeForm();
+    // Initialize number inputs on page load
+    initNumberInputs();
 });
-
-/**
- * Initialize stock update forms with AJAX submission and validation
- */
-function initStockUpdateForms() {
-    // Get all stock update forms
-    const stockForms = document.querySelectorAll('.stock-update-form');
-
-    // Add event listener to each form
-    stockForms.forEach(form => {
-        // Add validation to quantity input
-        const quantityInput = form.querySelector('input[name="quantity"]');
-        if (quantityInput) {
-            quantityInput.addEventListener('input', function() {
-                validateQuantityInput(this);
-            });
-        }
-
-        // Add submit handler
-        form.addEventListener('submit', function(e) {
-            e.preventDefault();
-
-            // Validate form before submission
-            if (!validateStockForm(form)) {
-                return;
-            }
-
-            // Get form data
-            const formData = new FormData(form);
-
-            // Show loading state
-            const submitButton = form.querySelector('button[type="submit"]');
-            const originalText = submitButton.textContent;
-            submitButton.textContent = 'Updating...';
-            submitButton.disabled = true;
-
-            // Send AJAX request
-            fetch(form.action, {
-                method: 'POST',
-                body: formData
-            })
-            .then(response => {
-                if (!response.ok) {
-                    throw new Error('Network response was not ok');
-                }
-                return response.json();
-            })
-            .then(data => {
-                // Reset button state
-                submitButton.textContent = originalText;
-                submitButton.disabled = false;
-
-                if (data.success) {
-                    // Show success message
-                    showAlert(form.parentNode, 'success', 'Stock updated successfully.');
-                } else {
-                    // Show error message
-                    showAlert(form.parentNode, 'danger', `Error updating stock: ${data.message}`);
-                }
-            })
-            .catch(error => {
-                // Reset button state
-                submitButton.textContent = originalText;
-                submitButton.disabled = false;
-
-                // Show error message
-                showAlert(form.parentNode, 'danger', `Error: ${error.message}`);
-                console.error('Error:', error);
-            });
-        });
-    });
-}
-
-/**
- * Initialize edit buttons
- */
-function initEditButtons() {
-    const editButtons = document.querySelectorAll('.btn-edit-drink-type');
-
-    editButtons.forEach(button => {
-        button.addEventListener('click', function() {
-            const drinkTypeId = this.dataset.drinkTypeId;
-            window.location.href = `/drink-types/edit/${drinkTypeId}`;
-        });
-    });
-}
-
-/**
- * Validate a stock update form
- * @param {HTMLFormElement} form - The form to validate
- * @returns {boolean} - Whether the form is valid
- */
-function validateStockForm(form) {
-    const quantityInput = form.querySelector('input[name="quantity"]');
-    return validateQuantityInput(quantityInput);
-}
-
-/**
- * Validate a quantity input
- * @param {HTMLInputElement} input - The input to validate
- * @returns {boolean} - Whether the input is valid
- */
-function validateQuantityInput(input) {
-    const value = parseInt(input.value);
-
-    // Check if value is a number
-    if (isNaN(value)) {
-        input.classList.add('is-invalid');
-        showInputError(input, 'Please enter a valid number');
-        return false;
-    }
-
-    // Check if value is non-negative
-    if (value < 0) {
-        input.classList.add('is-invalid');
-        showInputError(input, 'Quantity cannot be negative');
-        return false;
-    }
-
-    // Input is valid
-    input.classList.remove('is-invalid');
-    input.classList.add('is-valid');
-    return true;
-}
-
-/**
- * Show an error message for an input
- * @param {HTMLInputElement} input - The input with the error
- * @param {string} message - The error message
- */
-function showInputError(input, message) {
-    // Remove any existing error message
-    const existingError = input.parentNode.querySelector('.invalid-feedback');
-    if (existingError) {
-        existingError.remove();
-    }
-
-    // Create and add new error message
-    const errorDiv = document.createElement('div');
-    errorDiv.className = 'invalid-feedback';
-    errorDiv.textContent = message;
-    input.parentNode.appendChild(errorDiv);
-}
-
-/**
- * Show an alert message
- * @param {HTMLElement} container - The container to add the alert to
- * @param {string} type - The type of alert (success, danger, warning, info)
- * @param {string} message - The alert message
- */
-function showAlert(container, type, message) {
-    // Remove any existing alerts
-    const existingAlerts = container.querySelectorAll('.alert');
-    existingAlerts.forEach(alert => alert.remove());
-
-    // Create and add new alert
-    const alert = document.createElement('div');
-    alert.className = `alert alert-${type} alert-dismissible fade show mt-3`;
-    alert.innerHTML = `
-        ${message}
-        <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-    `;
-    container.appendChild(alert);
-
-    // Remove alert after 3 seconds
-    setTimeout(() => {
-        alert.remove();
-    }, 3000);
-}
-
-/**
- * Initialize order forms with validation and dynamic item handling
- */
-function initOrderForms() {
-    const orderForm = document.getElementById('orderForm');
-    if (!orderForm) return;
-
-    // Validate all quantity inputs
-    const quantityInputs = orderForm.querySelectorAll('input[type="number"]');
-    quantityInputs.forEach(input => {
-        input.addEventListener('input', function() {
-            validateQuantityInput(this);
-        });
-    });
-
-    // Add form submission handler
-    orderForm.addEventListener('submit', function(e) {
-        // Validate all inputs before submission
-        let isValid = true;
-        quantityInputs.forEach(input => {
-            if (!validateQuantityInput(input)) {
-                isValid = false;
-            }
-        });
-
-        if (!isValid) {
-            e.preventDefault();
-            showAlert(orderForm, 'danger', 'Please correct the errors in the form before submitting.');
-        }
-    });
-
-    // Add "Add Item" button functionality if it exists
-    const addItemButton = document.getElementById('addOrderItem');
-    if (addItemButton) {
-        addItemButton.addEventListener('click', function() {
-            addOrderItem();
-        });
-    }
-
-    // Add "Remove Item" button functionality
-    const removeButtons = orderForm.querySelectorAll('.remove-order-item');
-    removeButtons.forEach(button => {
-        button.addEventListener('click', function() {
-            removeOrderItem(this);
-        });
-    });
-}
-
-/**
- * Add a new order item row to the order form
- */
-function addOrderItem() {
-    const orderItemsTable = document.querySelector('#orderForm table tbody');
-    const drinkTypeSelect = document.getElementById('drinkTypeSelect');
-
-    if (!orderItemsTable || !drinkTypeSelect) return;
-
-    // Get the selected drink type
-    const selectedOption = drinkTypeSelect.options[drinkTypeSelect.selectedIndex];
-    const drinkTypeId = selectedOption.value;
-    const drinkTypeName = selectedOption.text;
-
-    // Check if this drink type is already in the table
-    const existingRow = orderItemsTable.querySelector(`input[value="${drinkTypeId}"]`);
-    if (existingRow) {
-        showAlert(orderItemsTable.parentNode, 'warning', `${drinkTypeName} is already in the order.`);
-        return;
-    }
-
-    // Create a new row
-    const newRow = document.createElement('tr');
-    const rowCount = orderItemsTable.querySelectorAll('tr').length;
-
-    newRow.innerHTML = `
-        <td>${drinkTypeName}</td>
-        <td>
-            <input type="hidden" name="items[${rowCount}][drinkTypeId]" value="${drinkTypeId}">
-            <input type="number" name="items[${rowCount}][quantity]" 
-                   class="form-control form-control-sm order-quantity" 
-                   value="1" min="0">
-        </td>
-        <td>
-            <button type="button" class="btn btn-sm btn-danger remove-order-item">Remove</button>
-        </td>
-    `;
-
-    // Add event listeners to the new row
-    const quantityInput = newRow.querySelector('input[type="number"]');
-    quantityInput.addEventListener('input', function() {
-        validateQuantityInput(this);
-    });
-
-    const removeButton = newRow.querySelector('.remove-order-item');
-    removeButton.addEventListener('click', function() {
-        removeOrderItem(this);
-    });
-
-    // Add the row to the table
-    orderItemsTable.appendChild(newRow);
-}
-
-/**
- * Remove an order item row from the order form
- * @param {HTMLElement} button - The remove button that was clicked
- */
-function removeOrderItem(button) {
-    const row = button.closest('tr');
-    if (row) {
-        row.remove();
-    }
-}
-
-/**
- * Initialize order status forms with AJAX submission
- */
-function initOrderStatusForms() {
-    const statusForm = document.querySelector('form[action^="/orders/update-status/"]');
-    if (!statusForm) return;
-
-    statusForm.addEventListener('submit', function(e) {
-        e.preventDefault();
-
-        // Get form data
-        const formData = new FormData(statusForm);
-
-        // Show loading state
-        const submitButton = statusForm.querySelector('button[type="submit"]');
-        const originalText = submitButton.textContent;
-        submitButton.textContent = 'Updating...';
-        submitButton.disabled = true;
-
-        // Send AJAX request
-        fetch(statusForm.action, {
-            method: 'POST',
-            body: formData
-        })
-        .then(response => {
-            if (!response.ok) {
-                throw new Error('Network response was not ok');
-            }
-            return response.json();
-        })
-        .then(data => {
-            // Reset button state
-            submitButton.textContent = originalText;
-            submitButton.disabled = false;
-
-            if (data.success) {
-                // Show success message
-                showAlert(statusForm.parentNode, 'success', 'Order status updated successfully.');
-
-                // Update the status badge
-                const statusBadge = document.querySelector('.badge');
-                if (statusBadge) {
-                    // Remove old status classes
-                    statusBadge.classList.remove('bg-primary', 'bg-warning', 'bg-info', 'bg-success');
-
-                    // Add new status class
-                    const newStatus = formData.get('status');
-                    if (newStatus === 'new') {
-                        statusBadge.classList.add('bg-primary');
-                    } else if (newStatus === 'in_work') {
-                        statusBadge.classList.add('bg-warning');
-                    } else if (newStatus === 'ordered') {
-                        statusBadge.classList.add('bg-info');
-                    } else if (newStatus === 'fulfilled') {
-                        statusBadge.classList.add('bg-success');
-                    }
-
-                    // Update the text
-                    statusBadge.textContent = newStatus.charAt(0).toUpperCase() + newStatus.slice(1);
-                }
-            } else {
-                // Show error message
-                showAlert(statusForm.parentNode, 'danger', `Error updating status: ${data.message}`);
-            }
-        })
-        .catch(error => {
-            // Reset button state
-            submitButton.textContent = originalText;
-            submitButton.disabled = false;
-
-            // Show error message
-            showAlert(statusForm.parentNode, 'danger', `Error: ${error.message}`);
-            console.error('Error:', error);
-        });
-    });
-}
-
-/**
- * Initialize inventory form with validation, highlighting for changed values, and AJAX submission
- */
-function initInventoryForm() {
-    const inventoryForm = document.getElementById('inventoryForm');
-    if (!inventoryForm) return;
-
-    // Get all quantity inputs
-    const quantityInputs = inventoryForm.querySelectorAll('.inventory-quantity');
-
-    // Add event listener to each input for validation and highlighting
-    quantityInputs.forEach(input => {
-        // Store original value for comparison
-        const originalValue = parseInt(input.dataset.originalValue);
-
-        // Add input event listener for validation
-        input.addEventListener('input', function() {
-            // Validate input
-            validateQuantityInput(this);
-
-            // Highlight changed values
-            const currentValue = parseInt(this.value);
-            if (currentValue !== originalValue) {
-                this.classList.add('bg-warning', 'text-dark');
-            } else {
-                this.classList.remove('bg-warning', 'text-dark');
-            }
-        });
-    });
-
-    // Add submit handler
-    inventoryForm.addEventListener('submit', function(e) {
-        e.preventDefault();
-
-        // Validate all inputs before submission
-        let isValid = true;
-        quantityInputs.forEach(input => {
-            if (!validateQuantityInput(input)) {
-                isValid = false;
-            }
-        });
-
-        if (!isValid) {
-            showAlert(inventoryForm, 'danger', 'Please correct the errors in the form before submitting.');
-            return;
-        }
-
-        // Check if any values have changed
-        let hasChanges = false;
-        quantityInputs.forEach(input => {
-            const originalValue = parseInt(input.dataset.originalValue);
-            const currentValue = parseInt(input.value);
-            if (currentValue !== originalValue) {
-                hasChanges = true;
-            }
-        });
-
-        if (!hasChanges) {
-            showAlert(inventoryForm, 'warning', 'No changes detected. Nothing to update.');
-            return;
-        }
-
-        // Get form data
-        const formData = new FormData(inventoryForm);
-
-        // Add X-Requested-With header to indicate AJAX request
-        const headers = new Headers({
-            'X-Requested-With': 'XMLHttpRequest'
-        });
-
-        // Show loading state
-        const submitButton = inventoryForm.querySelector('button[type="submit"]');
-        const originalText = submitButton.textContent;
-        submitButton.textContent = 'Updating...';
-        submitButton.disabled = true;
-
-        // Send AJAX request
-        fetch(inventoryForm.action, {
-            method: 'POST',
-            headers: headers,
-            body: formData
-        })
-        .then(response => {
-            if (!response.ok) {
-                throw new Error('Network response was not ok');
-            }
-            return response.json();
-        })
-        .then(data => {
-            // Reset button state
-            submitButton.textContent = originalText;
-            submitButton.disabled = false;
-
-            if (data.success) {
-                // Show success message
-                showAlert(inventoryForm, 'success', 'Inventory updated successfully.');
-
-                // Update original values and remove highlighting
-                quantityInputs.forEach(input => {
-                    const drinkTypeId = input.previousElementSibling.value;
-                    const updatedItem = data.updatedItems.find(item => item.drinkTypeId == drinkTypeId);
-
-                    if (updatedItem) {
-                        input.dataset.originalValue = updatedItem.newQuantity;
-                        input.classList.remove('bg-warning', 'text-dark');
-                    }
-                });
-
-                // Show update results
-                const updateResults = document.getElementById('updateResults');
-                const updateResultsContent = document.getElementById('updateResultsContent');
-
-                if (updateResults && updateResultsContent) {
-                    updateResults.classList.remove('d-none');
-
-                    let resultsHtml = '<h6>The following items were updated:</h6><ul>';
-                    data.updatedItems.forEach(item => {
-                        resultsHtml += `<li>${item.name}: ${item.oldQuantity} → ${item.newQuantity}</li>`;
-                    });
-                    resultsHtml += '</ul>';
-
-                    updateResultsContent.innerHTML = resultsHtml;
-                }
-            } else {
-                // Show error message
-                let errorMessage = 'Error updating inventory.';
-                if (data.errors && data.errors.length > 0) {
-                    errorMessage += ' ' + data.errors.join(' ');
-                }
-                showAlert(inventoryForm, 'danger', errorMessage);
-            }
-        })
-        .catch(error => {
-            // Reset button state
-            submitButton.textContent = originalText;
-            submitButton.disabled = false;
-
-            // Show error message
-            showAlert(inventoryForm, 'danger', `Error: ${error.message}`);
-            console.error('Error:', error);
-        });
-    });
-}
-
-/**
- * Initialize settings form with validation and AJAX submission
- */
-function initSettingsForm() {
-    const settingsForm = document.getElementById('settings-form');
-    if (!settingsForm) return;
-
-    // Get all inputs
-    const textInputs = settingsForm.querySelectorAll('input[type="text"]');
-    const numberInputs = settingsForm.querySelectorAll('input[type="number"]');
-
-    // Add event listeners for validation
-    textInputs.forEach(input => {
-        input.addEventListener('input', function() {
-            validateSettingTextInput(this);
-        });
-    });
-
-    numberInputs.forEach(input => {
-        input.addEventListener('input', function() {
-            validateSettingNumberInput(this);
-        });
-    });
-
-    // Add submit handler
-    settingsForm.addEventListener('submit', function(e) {
-        // Validate all inputs before submission
-        let isValid = true;
-
-        textInputs.forEach(input => {
-            if (!validateSettingTextInput(input)) {
-                isValid = false;
-            }
-        });
-
-        numberInputs.forEach(input => {
-            if (!validateSettingNumberInput(input)) {
-                isValid = false;
-            }
-        });
-
-        if (!isValid) {
-            e.preventDefault();
-            showAlert(settingsForm, 'danger', 'Please correct the errors in the form before submitting.');
-        }
-    });
-
-    // Reset to defaults button
-    const resetButton = document.getElementById('reset-defaults');
-    if (resetButton) {
-        resetButton.addEventListener('click', function() {
-            if (confirm('Are you sure you want to reset all settings to their default values?')) {
-                window.location.href = '/settings/reset';
-            }
-        });
-    }
-}
-
-/**
- * Validate a text input for settings
- * @param {HTMLInputElement} input - The input to validate
- * @returns {boolean} - Whether the input is valid
- */
-function validateSettingTextInput(input) {
-    // Check if value is empty
-    if (input.value.trim() === '') {
-        input.classList.add('is-invalid');
-        showInputError(input, 'This field cannot be empty');
-        return false;
-    }
-
-    // Input is valid
-    input.classList.remove('is-invalid');
-    input.classList.add('is-valid');
-    return true;
-}
-
-/**
- * Validate a number input for settings
- * @param {HTMLInputElement} input - The input to validate
- * @returns {boolean} - Whether the input is valid
- */
-function validateSettingNumberInput(input) {
-    const value = parseInt(input.value);
-
-    // Check if value is a number
-    if (isNaN(value)) {
-        input.classList.add('is-invalid');
-        showInputError(input, 'Please enter a valid number');
-        return false;
-    }
-
-    // Check if value is positive
-    if (value < 1) {
-        input.classList.add('is-invalid');
-        showInputError(input, 'Please enter a positive number');
-        return false;
-    }
-
-    // Input is valid
-    input.classList.remove('is-invalid');
-    input.classList.add('is-valid');
-    return true;
-}
-
-/**
- * Initialize drink type form with validation and AJAX name uniqueness check
- */
-function initDrinkTypeForm() {
-    const drinkTypeForm = document.getElementById('drink-type-form');
-    if (!drinkTypeForm) return;
-
-    // Get form inputs
-    const nameInput = drinkTypeForm.querySelector('input[name="name"]');
-    const descriptionInput = drinkTypeForm.querySelector('textarea[name="description"]');
-    const desiredStockInput = drinkTypeForm.querySelector('input[name="desired_stock"]');
-
-    // Store original name for edit mode
-    const originalName = nameInput ? nameInput.value : '';
-
-    // Add validation for name input
-    if (nameInput) {
-        nameInput.addEventListener('input', function() {
-            validateDrinkTypeName(this, originalName);
-        });
-
-        // Check name uniqueness on blur
-        nameInput.addEventListener('blur', function() {
-            checkDrinkTypeNameUniqueness(this, originalName);
-        });
-    }
-
-    // Add validation for desired stock input
-    if (desiredStockInput) {
-        desiredStockInput.addEventListener('input', function() {
-            validateDesiredStock(this);
-        });
-    }
-
-    // Add form submission handler
-    drinkTypeForm.addEventListener('submit', function(e) {
-        let isValid = true;
-
-        // Validate name
-        if (nameInput && !validateDrinkTypeName(nameInput, originalName)) {
-            isValid = false;
-        }
-
-        // Validate desired stock
-        if (desiredStockInput && !validateDesiredStock(desiredStockInput)) {
-            isValid = false;
-        }
-
-        if (!isValid) {
-            e.preventDefault();
-            showAlert(drinkTypeForm, 'danger', 'Please correct the errors in the form before submitting.');
-        }
-    });
-}
-
-/**
- * Validate a drink type name
- * @param {HTMLInputElement} input - The input to validate
- * @param {string} originalName - The original name (for edit mode)
- * @returns {boolean} - Whether the input is valid
- */
-function validateDrinkTypeName(input, originalName) {
-    const value = input.value.trim();
-
-    // Check if value is empty
-    if (value === '') {
-        input.classList.add('is-invalid');
-        showInputError(input, 'Name is required');
-        return false;
-    }
-
-    // Check if value is too long
-    if (value.length > 255) {
-        input.classList.add('is-invalid');
-        showInputError(input, 'Name cannot be longer than 255 characters');
-        return false;
-    }
-
-    // Input is valid
-    input.classList.remove('is-invalid');
-    input.classList.add('is-valid');
-    return true;
-}
-
-/**
- * Check if a drink type name is unique
- * @param {HTMLInputElement} input - The input to check
- * @param {string} originalName - The original name (for edit mode)
- */
-function checkDrinkTypeNameUniqueness(input, originalName) {
-    const value = input.value.trim();
-
-    // Skip check if name hasn't changed or is empty
-    if (value === '' || value === originalName) {
-        return;
-    }
-
-    // Show loading state
-    input.classList.add('is-loading');
-
-    // Check if name already exists
-    fetch(`/api/drink-types/check-name?name=${encodeURIComponent(value)}`)
-        .then(response => {
-            if (!response.ok) {
-                throw new Error('Network response was not ok');
-            }
-            return response.json();
-        })
-        .then(data => {
-            // Remove loading state
-            input.classList.remove('is-loading');
-
-            if (data.exists) {
-                input.classList.add('is-invalid');
-                showInputError(input, 'A drink type with this name already exists');
-            }
-        })
-        .catch(error => {
-            // Remove loading state
-            input.classList.remove('is-loading');
-            console.error('Error checking name uniqueness:', error);
-        });
-}
-
-/**
- * Validate a desired stock input
- * @param {HTMLInputElement} input - The input to validate
- * @returns {boolean} - Whether the input is valid
- */
-function validateDesiredStock(input) {
-    const value = parseInt(input.value);
-
-    // Check if value is a number
-    if (isNaN(value)) {
-        input.classList.add('is-invalid');
-        showInputError(input, 'Desired stock must be a number');
-        return false;
-    }
-
-    // Check if value is non-negative
-    if (value < 0) {
-        input.classList.add('is-invalid');
-        showInputError(input, 'Desired stock cannot be negative');
-        return false;
-    }
-
-    // Input is valid
-    input.classList.remove('is-invalid');
-    input.classList.add('is-valid');
-    return true;
-}
diff --git a/public/assets/js/htmx.min.js b/public/assets/js/htmx.min.js
new file mode 100644
index 0000000..59937d7
--- /dev/null
+++ b/public/assets/js/htmx.min.js
@@ -0,0 +1 @@
+var htmx=function(){"use strict";const Q={onLoad:null,process:null,on:null,off:null,trigger:null,ajax:null,find:null,findAll:null,closest:null,values:function(e,t){const n=cn(e,t||"post");return n.values},remove:null,addClass:null,removeClass:null,toggleClass:null,takeClass:null,swap:null,defineExtension:null,removeExtension:null,logAll:null,logNone:null,logger:null,config:{historyEnabled:true,historyCacheSize:10,refreshOnHistoryMiss:false,defaultSwapStyle:"innerHTML",defaultSwapDelay:0,defaultSettleDelay:20,includeIndicatorStyles:true,indicatorClass:"htmx-indicator",requestClass:"htmx-request",addedClass:"htmx-added",settlingClass:"htmx-settling",swappingClass:"htmx-swapping",allowEval:true,allowScriptTags:true,inlineScriptNonce:"",inlineStyleNonce:"",attributesToSettle:["class","style","width","height"],withCredentials:false,timeout:0,wsReconnectDelay:"full-jitter",wsBinaryType:"blob",disableSelector:"[hx-disable], [data-hx-disable]",scrollBehavior:"instant",defaultFocusScroll:false,getCacheBusterParam:false,globalViewTransitions:false,methodsThatUseUrlParams:["get","delete"],selfRequestsOnly:true,ignoreTitle:false,scrollIntoViewOnBoost:true,triggerSpecsCache:null,disableInheritance:false,responseHandling:[{code:"204",swap:false},{code:"[23]..",swap:true},{code:"[45]..",swap:false,error:true}],allowNestedOobSwaps:true},parseInterval:null,_:null,version:"2.0.4"};Q.onLoad=j;Q.process=kt;Q.on=ye;Q.off=be;Q.trigger=he;Q.ajax=Rn;Q.find=u;Q.findAll=x;Q.closest=g;Q.remove=z;Q.addClass=K;Q.removeClass=G;Q.toggleClass=W;Q.takeClass=Z;Q.swap=$e;Q.defineExtension=Fn;Q.removeExtension=Bn;Q.logAll=V;Q.logNone=_;Q.parseInterval=d;Q._=e;const n={addTriggerHandler:St,bodyContains:le,canAccessLocalStorage:B,findThisElement:Se,filterValues:hn,swap:$e,hasAttribute:s,getAttributeValue:te,getClosestAttributeValue:re,getClosestMatch:o,getExpressionVars:En,getHeaders:fn,getInputValues:cn,getInternalData:ie,getSwapSpecification:gn,getTriggerSpecs:st,getTarget:Ee,makeFragment:P,mergeObjects:ce,makeSettleInfo:xn,oobSwap:He,querySelectorExt:ae,settleImmediately:Kt,shouldCancel:ht,triggerEvent:he,triggerErrorEvent:fe,withExtensions:Ft};const r=["get","post","put","delete","patch"];const H=r.map(function(e){return"[hx-"+e+"], [data-hx-"+e+"]"}).join(", ");function d(e){if(e==undefined){return undefined}let t=NaN;if(e.slice(-2)=="ms"){t=parseFloat(e.slice(0,-2))}else if(e.slice(-1)=="s"){t=parseFloat(e.slice(0,-1))*1e3}else if(e.slice(-1)=="m"){t=parseFloat(e.slice(0,-1))*1e3*60}else{t=parseFloat(e)}return isNaN(t)?undefined:t}function ee(e,t){return e instanceof Element&&e.getAttribute(t)}function s(e,t){return!!e.hasAttribute&&(e.hasAttribute(t)||e.hasAttribute("data-"+t))}function te(e,t){return ee(e,t)||ee(e,"data-"+t)}function c(e){const t=e.parentElement;if(!t&&e.parentNode instanceof ShadowRoot)return e.parentNode;return t}function ne(){return document}function m(e,t){return e.getRootNode?e.getRootNode({composed:t}):ne()}function o(e,t){while(e&&!t(e)){e=c(e)}return e||null}function i(e,t,n){const r=te(t,n);const o=te(t,"hx-disinherit");var i=te(t,"hx-inherit");if(e!==t){if(Q.config.disableInheritance){if(i&&(i==="*"||i.split(" ").indexOf(n)>=0)){return r}else{return null}}if(o&&(o==="*"||o.split(" ").indexOf(n)>=0)){return"unset"}}return r}function re(t,n){let r=null;o(t,function(e){return!!(r=i(t,ue(e),n))});if(r!=="unset"){return r}}function h(e,t){const n=e instanceof Element&&(e.matches||e.matchesSelector||e.msMatchesSelector||e.mozMatchesSelector||e.webkitMatchesSelector||e.oMatchesSelector);return!!n&&n.call(e,t)}function T(e){const t=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i;const n=t.exec(e);if(n){return n[1].toLowerCase()}else{return""}}function q(e){const t=new DOMParser;return t.parseFromString(e,"text/html")}function L(e,t){while(t.childNodes.length>0){e.append(t.childNodes[0])}}function A(e){const t=ne().createElement("script");se(e.attributes,function(e){t.setAttribute(e.name,e.value)});t.textContent=e.textContent;t.async=false;if(Q.config.inlineScriptNonce){t.nonce=Q.config.inlineScriptNonce}return t}function N(e){return e.matches("script")&&(e.type==="text/javascript"||e.type==="module"||e.type==="")}function I(e){Array.from(e.querySelectorAll("script")).forEach(e=>{if(N(e)){const t=A(e);const n=e.parentNode;try{n.insertBefore(t,e)}catch(e){O(e)}finally{e.remove()}}})}function P(e){const t=e.replace(/<head(\s[^>]*)?>[\s\S]*?<\/head>/i,"");const n=T(t);let r;if(n==="html"){r=new DocumentFragment;const i=q(e);L(r,i.body);r.title=i.title}else if(n==="body"){r=new DocumentFragment;const i=q(t);L(r,i.body);r.title=i.title}else{const i=q('<body><template class="internal-htmx-wrapper">'+t+"</template></body>");r=i.querySelector("template").content;r.title=i.title;var o=r.querySelector("title");if(o&&o.parentNode===r){o.remove();r.title=o.innerText}}if(r){if(Q.config.allowScriptTags){I(r)}else{r.querySelectorAll("script").forEach(e=>e.remove())}}return r}function oe(e){if(e){e()}}function t(e,t){return Object.prototype.toString.call(e)==="[object "+t+"]"}function k(e){return typeof e==="function"}function D(e){return t(e,"Object")}function ie(e){const t="htmx-internal-data";let n=e[t];if(!n){n=e[t]={}}return n}function M(t){const n=[];if(t){for(let e=0;e<t.length;e++){n.push(t[e])}}return n}function se(t,n){if(t){for(let e=0;e<t.length;e++){n(t[e])}}}function X(e){const t=e.getBoundingClientRect();const n=t.top;const r=t.bottom;return n<window.innerHeight&&r>=0}function le(e){return e.getRootNode({composed:true})===document}function F(e){return e.trim().split(/\s+/)}function ce(e,t){for(const n in t){if(t.hasOwnProperty(n)){e[n]=t[n]}}return e}function S(e){try{return JSON.parse(e)}catch(e){O(e);return null}}function B(){const e="htmx:localStorageTest";try{localStorage.setItem(e,e);localStorage.removeItem(e);return true}catch(e){return false}}function U(t){try{const e=new URL(t);if(e){t=e.pathname+e.search}if(!/^\/$/.test(t)){t=t.replace(/\/+$/,"")}return t}catch(e){return t}}function e(e){return vn(ne().body,function(){return eval(e)})}function j(t){const e=Q.on("htmx:load",function(e){t(e.detail.elt)});return e}function V(){Q.logger=function(e,t,n){if(console){console.log(t,e,n)}}}function _(){Q.logger=null}function u(e,t){if(typeof e!=="string"){return e.querySelector(t)}else{return u(ne(),e)}}function x(e,t){if(typeof e!=="string"){return e.querySelectorAll(t)}else{return x(ne(),e)}}function E(){return window}function z(e,t){e=y(e);if(t){E().setTimeout(function(){z(e);e=null},t)}else{c(e).removeChild(e)}}function ue(e){return e instanceof Element?e:null}function $(e){return e instanceof HTMLElement?e:null}function J(e){return typeof e==="string"?e:null}function f(e){return e instanceof Element||e instanceof Document||e instanceof DocumentFragment?e:null}function K(e,t,n){e=ue(y(e));if(!e){return}if(n){E().setTimeout(function(){K(e,t);e=null},n)}else{e.classList&&e.classList.add(t)}}function G(e,t,n){let r=ue(y(e));if(!r){return}if(n){E().setTimeout(function(){G(r,t);r=null},n)}else{if(r.classList){r.classList.remove(t);if(r.classList.length===0){r.removeAttribute("class")}}}}function W(e,t){e=y(e);e.classList.toggle(t)}function Z(e,t){e=y(e);se(e.parentElement.children,function(e){G(e,t)});K(ue(e),t)}function g(e,t){e=ue(y(e));if(e&&e.closest){return e.closest(t)}else{do{if(e==null||h(e,t)){return e}}while(e=e&&ue(c(e)));return null}}function l(e,t){return e.substring(0,t.length)===t}function Y(e,t){return e.substring(e.length-t.length)===t}function ge(e){const t=e.trim();if(l(t,"<")&&Y(t,"/>")){return t.substring(1,t.length-2)}else{return t}}function p(t,r,n){if(r.indexOf("global ")===0){return p(t,r.slice(7),true)}t=y(t);const o=[];{let t=0;let n=0;for(let e=0;e<r.length;e++){const l=r[e];if(l===","&&t===0){o.push(r.substring(n,e));n=e+1;continue}if(l==="<"){t++}else if(l==="/"&&e<r.length-1&&r[e+1]===">"){t--}}if(n<r.length){o.push(r.substring(n))}}const i=[];const s=[];while(o.length>0){const r=ge(o.shift());let e;if(r.indexOf("closest ")===0){e=g(ue(t),ge(r.substr(8)))}else if(r.indexOf("find ")===0){e=u(f(t),ge(r.substr(5)))}else if(r==="next"||r==="nextElementSibling"){e=ue(t).nextElementSibling}else if(r.indexOf("next ")===0){e=pe(t,ge(r.substr(5)),!!n)}else if(r==="previous"||r==="previousElementSibling"){e=ue(t).previousElementSibling}else if(r.indexOf("previous ")===0){e=me(t,ge(r.substr(9)),!!n)}else if(r==="document"){e=document}else if(r==="window"){e=window}else if(r==="body"){e=document.body}else if(r==="root"){e=m(t,!!n)}else if(r==="host"){e=t.getRootNode().host}else{s.push(r)}if(e){i.push(e)}}if(s.length>0){const e=s.join(",");const c=f(m(t,!!n));i.push(...M(c.querySelectorAll(e)))}return i}var pe=function(t,e,n){const r=f(m(t,n)).querySelectorAll(e);for(let e=0;e<r.length;e++){const o=r[e];if(o.compareDocumentPosition(t)===Node.DOCUMENT_POSITION_PRECEDING){return o}}};var me=function(t,e,n){const r=f(m(t,n)).querySelectorAll(e);for(let e=r.length-1;e>=0;e--){const o=r[e];if(o.compareDocumentPosition(t)===Node.DOCUMENT_POSITION_FOLLOWING){return o}}};function ae(e,t){if(typeof e!=="string"){return p(e,t)[0]}else{return p(ne().body,e)[0]}}function y(e,t){if(typeof e==="string"){return u(f(t)||document,e)}else{return e}}function xe(e,t,n,r){if(k(t)){return{target:ne().body,event:J(e),listener:t,options:n}}else{return{target:y(e),event:J(t),listener:n,options:r}}}function ye(t,n,r,o){Vn(function(){const e=xe(t,n,r,o);e.target.addEventListener(e.event,e.listener,e.options)});const e=k(n);return e?n:r}function be(t,n,r){Vn(function(){const e=xe(t,n,r);e.target.removeEventListener(e.event,e.listener)});return k(n)?n:r}const ve=ne().createElement("output");function we(e,t){const n=re(e,t);if(n){if(n==="this"){return[Se(e,t)]}else{const r=p(e,n);if(r.length===0){O('The selector "'+n+'" on '+t+" returned no matches!");return[ve]}else{return r}}}}function Se(e,t){return ue(o(e,function(e){return te(ue(e),t)!=null}))}function Ee(e){const t=re(e,"hx-target");if(t){if(t==="this"){return Se(e,"hx-target")}else{return ae(e,t)}}else{const n=ie(e);if(n.boosted){return ne().body}else{return e}}}function Ce(t){const n=Q.config.attributesToSettle;for(let e=0;e<n.length;e++){if(t===n[e]){return true}}return false}function Oe(t,n){se(t.attributes,function(e){if(!n.hasAttribute(e.name)&&Ce(e.name)){t.removeAttribute(e.name)}});se(n.attributes,function(e){if(Ce(e.name)){t.setAttribute(e.name,e.value)}})}function Re(t,e){const n=Un(e);for(let e=0;e<n.length;e++){const r=n[e];try{if(r.isInlineSwap(t)){return true}}catch(e){O(e)}}return t==="outerHTML"}function He(e,o,i,t){t=t||ne();let n="#"+ee(o,"id");let s="outerHTML";if(e==="true"){}else if(e.indexOf(":")>0){s=e.substring(0,e.indexOf(":"));n=e.substring(e.indexOf(":")+1)}else{s=e}o.removeAttribute("hx-swap-oob");o.removeAttribute("data-hx-swap-oob");const r=p(t,n,false);if(r){se(r,function(e){let t;const n=o.cloneNode(true);t=ne().createDocumentFragment();t.appendChild(n);if(!Re(s,e)){t=f(n)}const r={shouldSwap:true,target:e,fragment:t};if(!he(e,"htmx:oobBeforeSwap",r))return;e=r.target;if(r.shouldSwap){qe(t);_e(s,e,e,t,i);Te()}se(i.elts,function(e){he(e,"htmx:oobAfterSwap",r)})});o.parentNode.removeChild(o)}else{o.parentNode.removeChild(o);fe(ne().body,"htmx:oobErrorNoTarget",{content:o})}return e}function Te(){const e=u("#--htmx-preserve-pantry--");if(e){for(const t of[...e.children]){const n=u("#"+t.id);n.parentNode.moveBefore(t,n);n.remove()}e.remove()}}function qe(e){se(x(e,"[hx-preserve], [data-hx-preserve]"),function(e){const t=te(e,"id");const n=ne().getElementById(t);if(n!=null){if(e.moveBefore){let e=u("#--htmx-preserve-pantry--");if(e==null){ne().body.insertAdjacentHTML("afterend","<div id='--htmx-preserve-pantry--'></div>");e=u("#--htmx-preserve-pantry--")}e.moveBefore(n,null)}else{e.parentNode.replaceChild(n,e)}}})}function Le(l,e,c){se(e.querySelectorAll("[id]"),function(t){const n=ee(t,"id");if(n&&n.length>0){const r=n.replace("'","\\'");const o=t.tagName.replace(":","\\:");const e=f(l);const i=e&&e.querySelector(o+"[id='"+r+"']");if(i&&i!==e){const s=t.cloneNode();Oe(t,i);c.tasks.push(function(){Oe(t,s)})}}})}function Ae(e){return function(){G(e,Q.config.addedClass);kt(ue(e));Ne(f(e));he(e,"htmx:load")}}function Ne(e){const t="[autofocus]";const n=$(h(e,t)?e:e.querySelector(t));if(n!=null){n.focus()}}function a(e,t,n,r){Le(e,n,r);while(n.childNodes.length>0){const o=n.firstChild;K(ue(o),Q.config.addedClass);e.insertBefore(o,t);if(o.nodeType!==Node.TEXT_NODE&&o.nodeType!==Node.COMMENT_NODE){r.tasks.push(Ae(o))}}}function Ie(e,t){let n=0;while(n<e.length){t=(t<<5)-t+e.charCodeAt(n++)|0}return t}function Pe(t){let n=0;if(t.attributes){for(let e=0;e<t.attributes.length;e++){const r=t.attributes[e];if(r.value){n=Ie(r.name,n);n=Ie(r.value,n)}}}return n}function ke(t){const n=ie(t);if(n.onHandlers){for(let e=0;e<n.onHandlers.length;e++){const r=n.onHandlers[e];be(t,r.event,r.listener)}delete n.onHandlers}}function De(e){const t=ie(e);if(t.timeout){clearTimeout(t.timeout)}if(t.listenerInfos){se(t.listenerInfos,function(e){if(e.on){be(e.on,e.trigger,e.listener)}})}ke(e);se(Object.keys(t),function(e){if(e!=="firstInitCompleted")delete t[e]})}function b(e){he(e,"htmx:beforeCleanupElement");De(e);if(e.children){se(e.children,function(e){b(e)})}}function Me(t,e,n){if(t instanceof Element&&t.tagName==="BODY"){return Ve(t,e,n)}let r;const o=t.previousSibling;const i=c(t);if(!i){return}a(i,t,e,n);if(o==null){r=i.firstChild}else{r=o.nextSibling}n.elts=n.elts.filter(function(e){return e!==t});while(r&&r!==t){if(r instanceof Element){n.elts.push(r)}r=r.nextSibling}b(t);if(t instanceof Element){t.remove()}else{t.parentNode.removeChild(t)}}function Xe(e,t,n){return a(e,e.firstChild,t,n)}function Fe(e,t,n){return a(c(e),e,t,n)}function Be(e,t,n){return a(e,null,t,n)}function Ue(e,t,n){return a(c(e),e.nextSibling,t,n)}function je(e){b(e);const t=c(e);if(t){return t.removeChild(e)}}function Ve(e,t,n){const r=e.firstChild;a(e,r,t,n);if(r){while(r.nextSibling){b(r.nextSibling);e.removeChild(r.nextSibling)}b(r);e.removeChild(r)}}function _e(t,e,n,r,o){switch(t){case"none":return;case"outerHTML":Me(n,r,o);return;case"afterbegin":Xe(n,r,o);return;case"beforebegin":Fe(n,r,o);return;case"beforeend":Be(n,r,o);return;case"afterend":Ue(n,r,o);return;case"delete":je(n);return;default:var i=Un(e);for(let e=0;e<i.length;e++){const s=i[e];try{const l=s.handleSwap(t,n,r,o);if(l){if(Array.isArray(l)){for(let e=0;e<l.length;e++){const c=l[e];if(c.nodeType!==Node.TEXT_NODE&&c.nodeType!==Node.COMMENT_NODE){o.tasks.push(Ae(c))}}}return}}catch(e){O(e)}}if(t==="innerHTML"){Ve(n,r,o)}else{_e(Q.config.defaultSwapStyle,e,n,r,o)}}}function ze(e,n,r){var t=x(e,"[hx-swap-oob], [data-hx-swap-oob]");se(t,function(e){if(Q.config.allowNestedOobSwaps||e.parentElement===null){const t=te(e,"hx-swap-oob");if(t!=null){He(t,e,n,r)}}else{e.removeAttribute("hx-swap-oob");e.removeAttribute("data-hx-swap-oob")}});return t.length>0}function $e(e,t,r,o){if(!o){o={}}e=y(e);const i=o.contextElement?m(o.contextElement,false):ne();const n=document.activeElement;let s={};try{s={elt:n,start:n?n.selectionStart:null,end:n?n.selectionEnd:null}}catch(e){}const l=xn(e);if(r.swapStyle==="textContent"){e.textContent=t}else{let n=P(t);l.title=n.title;if(o.selectOOB){const u=o.selectOOB.split(",");for(let t=0;t<u.length;t++){const a=u[t].split(":",2);let e=a[0].trim();if(e.indexOf("#")===0){e=e.substring(1)}const f=a[1]||"true";const h=n.querySelector("#"+e);if(h){He(f,h,l,i)}}}ze(n,l,i);se(x(n,"template"),function(e){if(e.content&&ze(e.content,l,i)){e.remove()}});if(o.select){const d=ne().createDocumentFragment();se(n.querySelectorAll(o.select),function(e){d.appendChild(e)});n=d}qe(n);_e(r.swapStyle,o.contextElement,e,n,l);Te()}if(s.elt&&!le(s.elt)&&ee(s.elt,"id")){const g=document.getElementById(ee(s.elt,"id"));const p={preventScroll:r.focusScroll!==undefined?!r.focusScroll:!Q.config.defaultFocusScroll};if(g){if(s.start&&g.setSelectionRange){try{g.setSelectionRange(s.start,s.end)}catch(e){}}g.focus(p)}}e.classList.remove(Q.config.swappingClass);se(l.elts,function(e){if(e.classList){e.classList.add(Q.config.settlingClass)}he(e,"htmx:afterSwap",o.eventInfo)});if(o.afterSwapCallback){o.afterSwapCallback()}if(!r.ignoreTitle){kn(l.title)}const c=function(){se(l.tasks,function(e){e.call()});se(l.elts,function(e){if(e.classList){e.classList.remove(Q.config.settlingClass)}he(e,"htmx:afterSettle",o.eventInfo)});if(o.anchor){const e=ue(y("#"+o.anchor));if(e){e.scrollIntoView({block:"start",behavior:"auto"})}}yn(l.elts,r);if(o.afterSettleCallback){o.afterSettleCallback()}};if(r.settleDelay>0){E().setTimeout(c,r.settleDelay)}else{c()}}function Je(e,t,n){const r=e.getResponseHeader(t);if(r.indexOf("{")===0){const o=S(r);for(const i in o){if(o.hasOwnProperty(i)){let e=o[i];if(D(e)){n=e.target!==undefined?e.target:n}else{e={value:e}}he(n,i,e)}}}else{const s=r.split(",");for(let e=0;e<s.length;e++){he(n,s[e].trim(),[])}}}const Ke=/\s/;const v=/[\s,]/;const Ge=/[_$a-zA-Z]/;const We=/[_$a-zA-Z0-9]/;const Ze=['"',"'","/"];const w=/[^\s]/;const Ye=/[{(]/;const Qe=/[})]/;function et(e){const t=[];let n=0;while(n<e.length){if(Ge.exec(e.charAt(n))){var r=n;while(We.exec(e.charAt(n+1))){n++}t.push(e.substring(r,n+1))}else if(Ze.indexOf(e.charAt(n))!==-1){const o=e.charAt(n);var r=n;n++;while(n<e.length&&e.charAt(n)!==o){if(e.charAt(n)==="\\"){n++}n++}t.push(e.substring(r,n+1))}else{const i=e.charAt(n);t.push(i)}n++}return t}function tt(e,t,n){return Ge.exec(e.charAt(0))&&e!=="true"&&e!=="false"&&e!=="this"&&e!==n&&t!=="."}function nt(r,o,i){if(o[0]==="["){o.shift();let e=1;let t=" return (function("+i+"){ return (";let n=null;while(o.length>0){const s=o[0];if(s==="]"){e--;if(e===0){if(n===null){t=t+"true"}o.shift();t+=")})";try{const l=vn(r,function(){return Function(t)()},function(){return true});l.source=t;return l}catch(e){fe(ne().body,"htmx:syntax:error",{error:e,source:t});return null}}}else if(s==="["){e++}if(tt(s,n,i)){t+="(("+i+"."+s+") ? ("+i+"."+s+") : (window."+s+"))"}else{t=t+s}n=o.shift()}}}function C(e,t){let n="";while(e.length>0&&!t.test(e[0])){n+=e.shift()}return n}function rt(e){let t;if(e.length>0&&Ye.test(e[0])){e.shift();t=C(e,Qe).trim();e.shift()}else{t=C(e,v)}return t}const ot="input, textarea, select";function it(e,t,n){const r=[];const o=et(t);do{C(o,w);const l=o.length;const c=C(o,/[,\[\s]/);if(c!==""){if(c==="every"){const u={trigger:"every"};C(o,w);u.pollInterval=d(C(o,/[,\[\s]/));C(o,w);var i=nt(e,o,"event");if(i){u.eventFilter=i}r.push(u)}else{const a={trigger:c};var i=nt(e,o,"event");if(i){a.eventFilter=i}C(o,w);while(o.length>0&&o[0]!==","){const f=o.shift();if(f==="changed"){a.changed=true}else if(f==="once"){a.once=true}else if(f==="consume"){a.consume=true}else if(f==="delay"&&o[0]===":"){o.shift();a.delay=d(C(o,v))}else if(f==="from"&&o[0]===":"){o.shift();if(Ye.test(o[0])){var s=rt(o)}else{var s=C(o,v);if(s==="closest"||s==="find"||s==="next"||s==="previous"){o.shift();const h=rt(o);if(h.length>0){s+=" "+h}}}a.from=s}else if(f==="target"&&o[0]===":"){o.shift();a.target=rt(o)}else if(f==="throttle"&&o[0]===":"){o.shift();a.throttle=d(C(o,v))}else if(f==="queue"&&o[0]===":"){o.shift();a.queue=C(o,v)}else if(f==="root"&&o[0]===":"){o.shift();a[f]=rt(o)}else if(f==="threshold"&&o[0]===":"){o.shift();a[f]=C(o,v)}else{fe(e,"htmx:syntax:error",{token:o.shift()})}C(o,w)}r.push(a)}}if(o.length===l){fe(e,"htmx:syntax:error",{token:o.shift()})}C(o,w)}while(o[0]===","&&o.shift());if(n){n[t]=r}return r}function st(e){const t=te(e,"hx-trigger");let n=[];if(t){const r=Q.config.triggerSpecsCache;n=r&&r[t]||it(e,t,r)}if(n.length>0){return n}else if(h(e,"form")){return[{trigger:"submit"}]}else if(h(e,'input[type="button"], input[type="submit"]')){return[{trigger:"click"}]}else if(h(e,ot)){return[{trigger:"change"}]}else{return[{trigger:"click"}]}}function lt(e){ie(e).cancelled=true}function ct(e,t,n){const r=ie(e);r.timeout=E().setTimeout(function(){if(le(e)&&r.cancelled!==true){if(!gt(n,e,Mt("hx:poll:trigger",{triggerSpec:n,target:e}))){t(e)}ct(e,t,n)}},n.pollInterval)}function ut(e){return location.hostname===e.hostname&&ee(e,"href")&&ee(e,"href").indexOf("#")!==0}function at(e){return g(e,Q.config.disableSelector)}function ft(t,n,e){if(t instanceof HTMLAnchorElement&&ut(t)&&(t.target===""||t.target==="_self")||t.tagName==="FORM"&&String(ee(t,"method")).toLowerCase()!=="dialog"){n.boosted=true;let r,o;if(t.tagName==="A"){r="get";o=ee(t,"href")}else{const i=ee(t,"method");r=i?i.toLowerCase():"get";o=ee(t,"action");if(o==null||o===""){o=ne().location.href}if(r==="get"&&o.includes("?")){o=o.replace(/\?[^#]+/,"")}}e.forEach(function(e){pt(t,function(e,t){const n=ue(e);if(at(n)){b(n);return}de(r,o,n,t)},n,e,true)})}}function ht(e,t){const n=ue(t);if(!n){return false}if(e.type==="submit"||e.type==="click"){if(n.tagName==="FORM"){return true}if(h(n,'input[type="submit"], button')&&(h(n,"[form]")||g(n,"form")!==null)){return true}if(n instanceof HTMLAnchorElement&&n.href&&(n.getAttribute("href")==="#"||n.getAttribute("href").indexOf("#")!==0)){return true}}return false}function dt(e,t){return ie(e).boosted&&e instanceof HTMLAnchorElement&&t.type==="click"&&(t.ctrlKey||t.metaKey)}function gt(e,t,n){const r=e.eventFilter;if(r){try{return r.call(t,n)!==true}catch(e){const o=r.source;fe(ne().body,"htmx:eventFilter:error",{error:e,source:o});return true}}return false}function pt(l,c,e,u,a){const f=ie(l);let t;if(u.from){t=p(l,u.from)}else{t=[l]}if(u.changed){if(!("lastValue"in f)){f.lastValue=new WeakMap}t.forEach(function(e){if(!f.lastValue.has(u)){f.lastValue.set(u,new WeakMap)}f.lastValue.get(u).set(e,e.value)})}se(t,function(i){const s=function(e){if(!le(l)){i.removeEventListener(u.trigger,s);return}if(dt(l,e)){return}if(a||ht(e,l)){e.preventDefault()}if(gt(u,l,e)){return}const t=ie(e);t.triggerSpec=u;if(t.handledFor==null){t.handledFor=[]}if(t.handledFor.indexOf(l)<0){t.handledFor.push(l);if(u.consume){e.stopPropagation()}if(u.target&&e.target){if(!h(ue(e.target),u.target)){return}}if(u.once){if(f.triggeredOnce){return}else{f.triggeredOnce=true}}if(u.changed){const n=event.target;const r=n.value;const o=f.lastValue.get(u);if(o.has(n)&&o.get(n)===r){return}o.set(n,r)}if(f.delayed){clearTimeout(f.delayed)}if(f.throttle){return}if(u.throttle>0){if(!f.throttle){he(l,"htmx:trigger");c(l,e);f.throttle=E().setTimeout(function(){f.throttle=null},u.throttle)}}else if(u.delay>0){f.delayed=E().setTimeout(function(){he(l,"htmx:trigger");c(l,e)},u.delay)}else{he(l,"htmx:trigger");c(l,e)}}};if(e.listenerInfos==null){e.listenerInfos=[]}e.listenerInfos.push({trigger:u.trigger,listener:s,on:i});i.addEventListener(u.trigger,s)})}let mt=false;let xt=null;function yt(){if(!xt){xt=function(){mt=true};window.addEventListener("scroll",xt);window.addEventListener("resize",xt);setInterval(function(){if(mt){mt=false;se(ne().querySelectorAll("[hx-trigger*='revealed'],[data-hx-trigger*='revealed']"),function(e){bt(e)})}},200)}}function bt(e){if(!s(e,"data-hx-revealed")&&X(e)){e.setAttribute("data-hx-revealed","true");const t=ie(e);if(t.initHash){he(e,"revealed")}else{e.addEventListener("htmx:afterProcessNode",function(){he(e,"revealed")},{once:true})}}}function vt(e,t,n,r){const o=function(){if(!n.loaded){n.loaded=true;he(e,"htmx:trigger");t(e)}};if(r>0){E().setTimeout(o,r)}else{o()}}function wt(t,n,e){let i=false;se(r,function(r){if(s(t,"hx-"+r)){const o=te(t,"hx-"+r);i=true;n.path=o;n.verb=r;e.forEach(function(e){St(t,e,n,function(e,t){const n=ue(e);if(g(n,Q.config.disableSelector)){b(n);return}de(r,o,n,t)})})}});return i}function St(r,e,t,n){if(e.trigger==="revealed"){yt();pt(r,n,t,e);bt(ue(r))}else if(e.trigger==="intersect"){const o={};if(e.root){o.root=ae(r,e.root)}if(e.threshold){o.threshold=parseFloat(e.threshold)}const i=new IntersectionObserver(function(t){for(let e=0;e<t.length;e++){const n=t[e];if(n.isIntersecting){he(r,"intersect");break}}},o);i.observe(ue(r));pt(ue(r),n,t,e)}else if(!t.firstInitCompleted&&e.trigger==="load"){if(!gt(e,r,Mt("load",{elt:r}))){vt(ue(r),n,t,e.delay)}}else if(e.pollInterval>0){t.polling=true;ct(ue(r),n,e)}else{pt(r,n,t,e)}}function Et(e){const t=ue(e);if(!t){return false}const n=t.attributes;for(let e=0;e<n.length;e++){const r=n[e].name;if(l(r,"hx-on:")||l(r,"data-hx-on:")||l(r,"hx-on-")||l(r,"data-hx-on-")){return true}}return false}const Ct=(new XPathEvaluator).createExpression('.//*[@*[ starts-with(name(), "hx-on:") or starts-with(name(), "data-hx-on:") or'+' starts-with(name(), "hx-on-") or starts-with(name(), "data-hx-on-") ]]');function Ot(e,t){if(Et(e)){t.push(ue(e))}const n=Ct.evaluate(e);let r=null;while(r=n.iterateNext())t.push(ue(r))}function Rt(e){const t=[];if(e instanceof DocumentFragment){for(const n of e.childNodes){Ot(n,t)}}else{Ot(e,t)}return t}function Ht(e){if(e.querySelectorAll){const n=", [hx-boost] a, [data-hx-boost] a, a[hx-boost], a[data-hx-boost]";const r=[];for(const i in Mn){const s=Mn[i];if(s.getSelectors){var t=s.getSelectors();if(t){r.push(t)}}}const o=e.querySelectorAll(H+n+", form, [type='submit'],"+" [hx-ext], [data-hx-ext], [hx-trigger], [data-hx-trigger]"+r.flat().map(e=>", "+e).join(""));return o}else{return[]}}function Tt(e){const t=g(ue(e.target),"button, input[type='submit']");const n=Lt(e);if(n){n.lastButtonClicked=t}}function qt(e){const t=Lt(e);if(t){t.lastButtonClicked=null}}function Lt(e){const t=g(ue(e.target),"button, input[type='submit']");if(!t){return}const n=y("#"+ee(t,"form"),t.getRootNode())||g(t,"form");if(!n){return}return ie(n)}function At(e){e.addEventListener("click",Tt);e.addEventListener("focusin",Tt);e.addEventListener("focusout",qt)}function Nt(t,e,n){const r=ie(t);if(!Array.isArray(r.onHandlers)){r.onHandlers=[]}let o;const i=function(e){vn(t,function(){if(at(t)){return}if(!o){o=new Function("event",n)}o.call(t,e)})};t.addEventListener(e,i);r.onHandlers.push({event:e,listener:i})}function It(t){ke(t);for(let e=0;e<t.attributes.length;e++){const n=t.attributes[e].name;const r=t.attributes[e].value;if(l(n,"hx-on")||l(n,"data-hx-on")){const o=n.indexOf("-on")+3;const i=n.slice(o,o+1);if(i==="-"||i===":"){let e=n.slice(o+1);if(l(e,":")){e="htmx"+e}else if(l(e,"-")){e="htmx:"+e.slice(1)}else if(l(e,"htmx-")){e="htmx:"+e.slice(5)}Nt(t,e,r)}}}}function Pt(t){if(g(t,Q.config.disableSelector)){b(t);return}const n=ie(t);const e=Pe(t);if(n.initHash!==e){De(t);n.initHash=e;he(t,"htmx:beforeProcessNode");const r=st(t);const o=wt(t,n,r);if(!o){if(re(t,"hx-boost")==="true"){ft(t,n,r)}else if(s(t,"hx-trigger")){r.forEach(function(e){St(t,e,n,function(){})})}}if(t.tagName==="FORM"||ee(t,"type")==="submit"&&s(t,"form")){At(t)}n.firstInitCompleted=true;he(t,"htmx:afterProcessNode")}}function kt(e){e=y(e);if(g(e,Q.config.disableSelector)){b(e);return}Pt(e);se(Ht(e),function(e){Pt(e)});se(Rt(e),It)}function Dt(e){return e.replace(/([a-z0-9])([A-Z])/g,"$1-$2").toLowerCase()}function Mt(e,t){let n;if(window.CustomEvent&&typeof window.CustomEvent==="function"){n=new CustomEvent(e,{bubbles:true,cancelable:true,composed:true,detail:t})}else{n=ne().createEvent("CustomEvent");n.initCustomEvent(e,true,true,t)}return n}function fe(e,t,n){he(e,t,ce({error:t},n))}function Xt(e){return e==="htmx:afterProcessNode"}function Ft(e,t){se(Un(e),function(e){try{t(e)}catch(e){O(e)}})}function O(e){if(console.error){console.error(e)}else if(console.log){console.log("ERROR: ",e)}}function he(e,t,n){e=y(e);if(n==null){n={}}n.elt=e;const r=Mt(t,n);if(Q.logger&&!Xt(t)){Q.logger(e,t,n)}if(n.error){O(n.error);he(e,"htmx:error",{errorInfo:n})}let o=e.dispatchEvent(r);const i=Dt(t);if(o&&i!==t){const s=Mt(i,r.detail);o=o&&e.dispatchEvent(s)}Ft(ue(e),function(e){o=o&&(e.onEvent(t,r)!==false&&!r.defaultPrevented)});return o}let Bt=location.pathname+location.search;function Ut(){const e=ne().querySelector("[hx-history-elt],[data-hx-history-elt]");return e||ne().body}function jt(t,e){if(!B()){return}const n=_t(e);const r=ne().title;const o=window.scrollY;if(Q.config.historyCacheSize<=0){localStorage.removeItem("htmx-history-cache");return}t=U(t);const i=S(localStorage.getItem("htmx-history-cache"))||[];for(let e=0;e<i.length;e++){if(i[e].url===t){i.splice(e,1);break}}const s={url:t,content:n,title:r,scroll:o};he(ne().body,"htmx:historyItemCreated",{item:s,cache:i});i.push(s);while(i.length>Q.config.historyCacheSize){i.shift()}while(i.length>0){try{localStorage.setItem("htmx-history-cache",JSON.stringify(i));break}catch(e){fe(ne().body,"htmx:historyCacheError",{cause:e,cache:i});i.shift()}}}function Vt(t){if(!B()){return null}t=U(t);const n=S(localStorage.getItem("htmx-history-cache"))||[];for(let e=0;e<n.length;e++){if(n[e].url===t){return n[e]}}return null}function _t(e){const t=Q.config.requestClass;const n=e.cloneNode(true);se(x(n,"."+t),function(e){G(e,t)});se(x(n,"[data-disabled-by-htmx]"),function(e){e.removeAttribute("disabled")});return n.innerHTML}function zt(){const e=Ut();const t=Bt||location.pathname+location.search;let n;try{n=ne().querySelector('[hx-history="false" i],[data-hx-history="false" i]')}catch(e){n=ne().querySelector('[hx-history="false"],[data-hx-history="false"]')}if(!n){he(ne().body,"htmx:beforeHistorySave",{path:t,historyElt:e});jt(t,e)}if(Q.config.historyEnabled)history.replaceState({htmx:true},ne().title,window.location.href)}function $t(e){if(Q.config.getCacheBusterParam){e=e.replace(/org\.htmx\.cache-buster=[^&]*&?/,"");if(Y(e,"&")||Y(e,"?")){e=e.slice(0,-1)}}if(Q.config.historyEnabled){history.pushState({htmx:true},"",e)}Bt=e}function Jt(e){if(Q.config.historyEnabled)history.replaceState({htmx:true},"",e);Bt=e}function Kt(e){se(e,function(e){e.call(undefined)})}function Gt(o){const e=new XMLHttpRequest;const i={path:o,xhr:e};he(ne().body,"htmx:historyCacheMiss",i);e.open("GET",o,true);e.setRequestHeader("HX-Request","true");e.setRequestHeader("HX-History-Restore-Request","true");e.setRequestHeader("HX-Current-URL",ne().location.href);e.onload=function(){if(this.status>=200&&this.status<400){he(ne().body,"htmx:historyCacheMissLoad",i);const e=P(this.response);const t=e.querySelector("[hx-history-elt],[data-hx-history-elt]")||e;const n=Ut();const r=xn(n);kn(e.title);qe(e);Ve(n,t,r);Te();Kt(r.tasks);Bt=o;he(ne().body,"htmx:historyRestore",{path:o,cacheMiss:true,serverResponse:this.response})}else{fe(ne().body,"htmx:historyCacheMissLoadError",i)}};e.send()}function Wt(e){zt();e=e||location.pathname+location.search;const t=Vt(e);if(t){const n=P(t.content);const r=Ut();const o=xn(r);kn(t.title);qe(n);Ve(r,n,o);Te();Kt(o.tasks);E().setTimeout(function(){window.scrollTo(0,t.scroll)},0);Bt=e;he(ne().body,"htmx:historyRestore",{path:e,item:t})}else{if(Q.config.refreshOnHistoryMiss){window.location.reload(true)}else{Gt(e)}}}function Zt(e){let t=we(e,"hx-indicator");if(t==null){t=[e]}se(t,function(e){const t=ie(e);t.requestCount=(t.requestCount||0)+1;e.classList.add.call(e.classList,Q.config.requestClass)});return t}function Yt(e){let t=we(e,"hx-disabled-elt");if(t==null){t=[]}se(t,function(e){const t=ie(e);t.requestCount=(t.requestCount||0)+1;e.setAttribute("disabled","");e.setAttribute("data-disabled-by-htmx","")});return t}function Qt(e,t){se(e.concat(t),function(e){const t=ie(e);t.requestCount=(t.requestCount||1)-1});se(e,function(e){const t=ie(e);if(t.requestCount===0){e.classList.remove.call(e.classList,Q.config.requestClass)}});se(t,function(e){const t=ie(e);if(t.requestCount===0){e.removeAttribute("disabled");e.removeAttribute("data-disabled-by-htmx")}})}function en(t,n){for(let e=0;e<t.length;e++){const r=t[e];if(r.isSameNode(n)){return true}}return false}function tn(e){const t=e;if(t.name===""||t.name==null||t.disabled||g(t,"fieldset[disabled]")){return false}if(t.type==="button"||t.type==="submit"||t.tagName==="image"||t.tagName==="reset"||t.tagName==="file"){return false}if(t.type==="checkbox"||t.type==="radio"){return t.checked}return true}function nn(t,e,n){if(t!=null&&e!=null){if(Array.isArray(e)){e.forEach(function(e){n.append(t,e)})}else{n.append(t,e)}}}function rn(t,n,r){if(t!=null&&n!=null){let e=r.getAll(t);if(Array.isArray(n)){e=e.filter(e=>n.indexOf(e)<0)}else{e=e.filter(e=>e!==n)}r.delete(t);se(e,e=>r.append(t,e))}}function on(t,n,r,o,i){if(o==null||en(t,o)){return}else{t.push(o)}if(tn(o)){const s=ee(o,"name");let e=o.value;if(o instanceof HTMLSelectElement&&o.multiple){e=M(o.querySelectorAll("option:checked")).map(function(e){return e.value})}if(o instanceof HTMLInputElement&&o.files){e=M(o.files)}nn(s,e,n);if(i){sn(o,r)}}if(o instanceof HTMLFormElement){se(o.elements,function(e){if(t.indexOf(e)>=0){rn(e.name,e.value,n)}else{t.push(e)}if(i){sn(e,r)}});new FormData(o).forEach(function(e,t){if(e instanceof File&&e.name===""){return}nn(t,e,n)})}}function sn(e,t){const n=e;if(n.willValidate){he(n,"htmx:validation:validate");if(!n.checkValidity()){t.push({elt:n,message:n.validationMessage,validity:n.validity});he(n,"htmx:validation:failed",{message:n.validationMessage,validity:n.validity})}}}function ln(n,e){for(const t of e.keys()){n.delete(t)}e.forEach(function(e,t){n.append(t,e)});return n}function cn(e,t){const n=[];const r=new FormData;const o=new FormData;const i=[];const s=ie(e);if(s.lastButtonClicked&&!le(s.lastButtonClicked)){s.lastButtonClicked=null}let l=e instanceof HTMLFormElement&&e.noValidate!==true||te(e,"hx-validate")==="true";if(s.lastButtonClicked){l=l&&s.lastButtonClicked.formNoValidate!==true}if(t!=="get"){on(n,o,i,g(e,"form"),l)}on(n,r,i,e,l);if(s.lastButtonClicked||e.tagName==="BUTTON"||e.tagName==="INPUT"&&ee(e,"type")==="submit"){const u=s.lastButtonClicked||e;const a=ee(u,"name");nn(a,u.value,o)}const c=we(e,"hx-include");se(c,function(e){on(n,r,i,ue(e),l);if(!h(e,"form")){se(f(e).querySelectorAll(ot),function(e){on(n,r,i,e,l)})}});ln(r,o);return{errors:i,formData:r,values:An(r)}}function un(e,t,n){if(e!==""){e+="&"}if(String(n)==="[object Object]"){n=JSON.stringify(n)}const r=encodeURIComponent(n);e+=encodeURIComponent(t)+"="+r;return e}function an(e){e=qn(e);let n="";e.forEach(function(e,t){n=un(n,t,e)});return n}function fn(e,t,n){const r={"HX-Request":"true","HX-Trigger":ee(e,"id"),"HX-Trigger-Name":ee(e,"name"),"HX-Target":te(t,"id"),"HX-Current-URL":ne().location.href};bn(e,"hx-headers",false,r);if(n!==undefined){r["HX-Prompt"]=n}if(ie(e).boosted){r["HX-Boosted"]="true"}return r}function hn(n,e){const t=re(e,"hx-params");if(t){if(t==="none"){return new FormData}else if(t==="*"){return n}else if(t.indexOf("not ")===0){se(t.slice(4).split(","),function(e){e=e.trim();n.delete(e)});return n}else{const r=new FormData;se(t.split(","),function(t){t=t.trim();if(n.has(t)){n.getAll(t).forEach(function(e){r.append(t,e)})}});return r}}else{return n}}function dn(e){return!!ee(e,"href")&&ee(e,"href").indexOf("#")>=0}function gn(e,t){const n=t||re(e,"hx-swap");const r={swapStyle:ie(e).boosted?"innerHTML":Q.config.defaultSwapStyle,swapDelay:Q.config.defaultSwapDelay,settleDelay:Q.config.defaultSettleDelay};if(Q.config.scrollIntoViewOnBoost&&ie(e).boosted&&!dn(e)){r.show="top"}if(n){const s=F(n);if(s.length>0){for(let e=0;e<s.length;e++){const l=s[e];if(l.indexOf("swap:")===0){r.swapDelay=d(l.slice(5))}else if(l.indexOf("settle:")===0){r.settleDelay=d(l.slice(7))}else if(l.indexOf("transition:")===0){r.transition=l.slice(11)==="true"}else if(l.indexOf("ignoreTitle:")===0){r.ignoreTitle=l.slice(12)==="true"}else if(l.indexOf("scroll:")===0){const c=l.slice(7);var o=c.split(":");const u=o.pop();var i=o.length>0?o.join(":"):null;r.scroll=u;r.scrollTarget=i}else if(l.indexOf("show:")===0){const a=l.slice(5);var o=a.split(":");const f=o.pop();var i=o.length>0?o.join(":"):null;r.show=f;r.showTarget=i}else if(l.indexOf("focus-scroll:")===0){const h=l.slice("focus-scroll:".length);r.focusScroll=h=="true"}else if(e==0){r.swapStyle=l}else{O("Unknown modifier in hx-swap: "+l)}}}}return r}function pn(e){return re(e,"hx-encoding")==="multipart/form-data"||h(e,"form")&&ee(e,"enctype")==="multipart/form-data"}function mn(t,n,r){let o=null;Ft(n,function(e){if(o==null){o=e.encodeParameters(t,r,n)}});if(o!=null){return o}else{if(pn(n)){return ln(new FormData,qn(r))}else{return an(r)}}}function xn(e){return{tasks:[],elts:[e]}}function yn(e,t){const n=e[0];const r=e[e.length-1];if(t.scroll){var o=null;if(t.scrollTarget){o=ue(ae(n,t.scrollTarget))}if(t.scroll==="top"&&(n||o)){o=o||n;o.scrollTop=0}if(t.scroll==="bottom"&&(r||o)){o=o||r;o.scrollTop=o.scrollHeight}}if(t.show){var o=null;if(t.showTarget){let e=t.showTarget;if(t.showTarget==="window"){e="body"}o=ue(ae(n,e))}if(t.show==="top"&&(n||o)){o=o||n;o.scrollIntoView({block:"start",behavior:Q.config.scrollBehavior})}if(t.show==="bottom"&&(r||o)){o=o||r;o.scrollIntoView({block:"end",behavior:Q.config.scrollBehavior})}}}function bn(r,e,o,i){if(i==null){i={}}if(r==null){return i}const s=te(r,e);if(s){let e=s.trim();let t=o;if(e==="unset"){return null}if(e.indexOf("javascript:")===0){e=e.slice(11);t=true}else if(e.indexOf("js:")===0){e=e.slice(3);t=true}if(e.indexOf("{")!==0){e="{"+e+"}"}let n;if(t){n=vn(r,function(){return Function("return ("+e+")")()},{})}else{n=S(e)}for(const l in n){if(n.hasOwnProperty(l)){if(i[l]==null){i[l]=n[l]}}}}return bn(ue(c(r)),e,o,i)}function vn(e,t,n){if(Q.config.allowEval){return t()}else{fe(e,"htmx:evalDisallowedError");return n}}function wn(e,t){return bn(e,"hx-vars",true,t)}function Sn(e,t){return bn(e,"hx-vals",false,t)}function En(e){return ce(wn(e),Sn(e))}function Cn(t,n,r){if(r!==null){try{t.setRequestHeader(n,r)}catch(e){t.setRequestHeader(n,encodeURIComponent(r));t.setRequestHeader(n+"-URI-AutoEncoded","true")}}}function On(t){if(t.responseURL&&typeof URL!=="undefined"){try{const e=new URL(t.responseURL);return e.pathname+e.search}catch(e){fe(ne().body,"htmx:badResponseUrl",{url:t.responseURL})}}}function R(e,t){return t.test(e.getAllResponseHeaders())}function Rn(t,n,r){t=t.toLowerCase();if(r){if(r instanceof Element||typeof r==="string"){return de(t,n,null,null,{targetOverride:y(r)||ve,returnPromise:true})}else{let e=y(r.target);if(r.target&&!e||r.source&&!e&&!y(r.source)){e=ve}return de(t,n,y(r.source),r.event,{handler:r.handler,headers:r.headers,values:r.values,targetOverride:e,swapOverride:r.swap,select:r.select,returnPromise:true})}}else{return de(t,n,null,null,{returnPromise:true})}}function Hn(e){const t=[];while(e){t.push(e);e=e.parentElement}return t}function Tn(e,t,n){let r;let o;if(typeof URL==="function"){o=new URL(t,document.location.href);const i=document.location.origin;r=i===o.origin}else{o=t;r=l(t,document.location.origin)}if(Q.config.selfRequestsOnly){if(!r){return false}}return he(e,"htmx:validateUrl",ce({url:o,sameHost:r},n))}function qn(e){if(e instanceof FormData)return e;const t=new FormData;for(const n in e){if(e.hasOwnProperty(n)){if(e[n]&&typeof e[n].forEach==="function"){e[n].forEach(function(e){t.append(n,e)})}else if(typeof e[n]==="object"&&!(e[n]instanceof Blob)){t.append(n,JSON.stringify(e[n]))}else{t.append(n,e[n])}}}return t}function Ln(r,o,e){return new Proxy(e,{get:function(t,e){if(typeof e==="number")return t[e];if(e==="length")return t.length;if(e==="push"){return function(e){t.push(e);r.append(o,e)}}if(typeof t[e]==="function"){return function(){t[e].apply(t,arguments);r.delete(o);t.forEach(function(e){r.append(o,e)})}}if(t[e]&&t[e].length===1){return t[e][0]}else{return t[e]}},set:function(e,t,n){e[t]=n;r.delete(o);e.forEach(function(e){r.append(o,e)});return true}})}function An(o){return new Proxy(o,{get:function(e,t){if(typeof t==="symbol"){const r=Reflect.get(e,t);if(typeof r==="function"){return function(){return r.apply(o,arguments)}}else{return r}}if(t==="toJSON"){return()=>Object.fromEntries(o)}if(t in e){if(typeof e[t]==="function"){return function(){return o[t].apply(o,arguments)}}else{return e[t]}}const n=o.getAll(t);if(n.length===0){return undefined}else if(n.length===1){return n[0]}else{return Ln(e,t,n)}},set:function(t,n,e){if(typeof n!=="string"){return false}t.delete(n);if(e&&typeof e.forEach==="function"){e.forEach(function(e){t.append(n,e)})}else if(typeof e==="object"&&!(e instanceof Blob)){t.append(n,JSON.stringify(e))}else{t.append(n,e)}return true},deleteProperty:function(e,t){if(typeof t==="string"){e.delete(t)}return true},ownKeys:function(e){return Reflect.ownKeys(Object.fromEntries(e))},getOwnPropertyDescriptor:function(e,t){return Reflect.getOwnPropertyDescriptor(Object.fromEntries(e),t)}})}function de(t,n,r,o,i,D){let s=null;let l=null;i=i!=null?i:{};if(i.returnPromise&&typeof Promise!=="undefined"){var e=new Promise(function(e,t){s=e;l=t})}if(r==null){r=ne().body}const M=i.handler||Dn;const X=i.select||null;if(!le(r)){oe(s);return e}const c=i.targetOverride||ue(Ee(r));if(c==null||c==ve){fe(r,"htmx:targetError",{target:te(r,"hx-target")});oe(l);return e}let u=ie(r);const a=u.lastButtonClicked;if(a){const L=ee(a,"formaction");if(L!=null){n=L}const A=ee(a,"formmethod");if(A!=null){if(A.toLowerCase()!=="dialog"){t=A}}}const f=re(r,"hx-confirm");if(D===undefined){const K=function(e){return de(t,n,r,o,i,!!e)};const G={target:c,elt:r,path:n,verb:t,triggeringEvent:o,etc:i,issueRequest:K,question:f};if(he(r,"htmx:confirm",G)===false){oe(s);return e}}let h=r;let d=re(r,"hx-sync");let g=null;let F=false;if(d){const N=d.split(":");const I=N[0].trim();if(I==="this"){h=Se(r,"hx-sync")}else{h=ue(ae(r,I))}d=(N[1]||"drop").trim();u=ie(h);if(d==="drop"&&u.xhr&&u.abortable!==true){oe(s);return e}else if(d==="abort"){if(u.xhr){oe(s);return e}else{F=true}}else if(d==="replace"){he(h,"htmx:abort")}else if(d.indexOf("queue")===0){const W=d.split(" ");g=(W[1]||"last").trim()}}if(u.xhr){if(u.abortable){he(h,"htmx:abort")}else{if(g==null){if(o){const P=ie(o);if(P&&P.triggerSpec&&P.triggerSpec.queue){g=P.triggerSpec.queue}}if(g==null){g="last"}}if(u.queuedRequests==null){u.queuedRequests=[]}if(g==="first"&&u.queuedRequests.length===0){u.queuedRequests.push(function(){de(t,n,r,o,i)})}else if(g==="all"){u.queuedRequests.push(function(){de(t,n,r,o,i)})}else if(g==="last"){u.queuedRequests=[];u.queuedRequests.push(function(){de(t,n,r,o,i)})}oe(s);return e}}const p=new XMLHttpRequest;u.xhr=p;u.abortable=F;const m=function(){u.xhr=null;u.abortable=false;if(u.queuedRequests!=null&&u.queuedRequests.length>0){const e=u.queuedRequests.shift();e()}};const B=re(r,"hx-prompt");if(B){var x=prompt(B);if(x===null||!he(r,"htmx:prompt",{prompt:x,target:c})){oe(s);m();return e}}if(f&&!D){if(!confirm(f)){oe(s);m();return e}}let y=fn(r,c,x);if(t!=="get"&&!pn(r)){y["Content-Type"]="application/x-www-form-urlencoded"}if(i.headers){y=ce(y,i.headers)}const U=cn(r,t);let b=U.errors;const j=U.formData;if(i.values){ln(j,qn(i.values))}const V=qn(En(r));const v=ln(j,V);let w=hn(v,r);if(Q.config.getCacheBusterParam&&t==="get"){w.set("org.htmx.cache-buster",ee(c,"id")||"true")}if(n==null||n===""){n=ne().location.href}const S=bn(r,"hx-request");const _=ie(r).boosted;let E=Q.config.methodsThatUseUrlParams.indexOf(t)>=0;const C={boosted:_,useUrlParams:E,formData:w,parameters:An(w),unfilteredFormData:v,unfilteredParameters:An(v),headers:y,target:c,verb:t,errors:b,withCredentials:i.credentials||S.credentials||Q.config.withCredentials,timeout:i.timeout||S.timeout||Q.config.timeout,path:n,triggeringEvent:o};if(!he(r,"htmx:configRequest",C)){oe(s);m();return e}n=C.path;t=C.verb;y=C.headers;w=qn(C.parameters);b=C.errors;E=C.useUrlParams;if(b&&b.length>0){he(r,"htmx:validation:halted",C);oe(s);m();return e}const z=n.split("#");const $=z[0];const O=z[1];let R=n;if(E){R=$;const Z=!w.keys().next().done;if(Z){if(R.indexOf("?")<0){R+="?"}else{R+="&"}R+=an(w);if(O){R+="#"+O}}}if(!Tn(r,R,C)){fe(r,"htmx:invalidPath",C);oe(l);return e}p.open(t.toUpperCase(),R,true);p.overrideMimeType("text/html");p.withCredentials=C.withCredentials;p.timeout=C.timeout;if(S.noHeaders){}else{for(const k in y){if(y.hasOwnProperty(k)){const Y=y[k];Cn(p,k,Y)}}}const H={xhr:p,target:c,requestConfig:C,etc:i,boosted:_,select:X,pathInfo:{requestPath:n,finalRequestPath:R,responsePath:null,anchor:O}};p.onload=function(){try{const t=Hn(r);H.pathInfo.responsePath=On(p);M(r,H);if(H.keepIndicators!==true){Qt(T,q)}he(r,"htmx:afterRequest",H);he(r,"htmx:afterOnLoad",H);if(!le(r)){let e=null;while(t.length>0&&e==null){const n=t.shift();if(le(n)){e=n}}if(e){he(e,"htmx:afterRequest",H);he(e,"htmx:afterOnLoad",H)}}oe(s);m()}catch(e){fe(r,"htmx:onLoadError",ce({error:e},H));throw e}};p.onerror=function(){Qt(T,q);fe(r,"htmx:afterRequest",H);fe(r,"htmx:sendError",H);oe(l);m()};p.onabort=function(){Qt(T,q);fe(r,"htmx:afterRequest",H);fe(r,"htmx:sendAbort",H);oe(l);m()};p.ontimeout=function(){Qt(T,q);fe(r,"htmx:afterRequest",H);fe(r,"htmx:timeout",H);oe(l);m()};if(!he(r,"htmx:beforeRequest",H)){oe(s);m();return e}var T=Zt(r);var q=Yt(r);se(["loadstart","loadend","progress","abort"],function(t){se([p,p.upload],function(e){e.addEventListener(t,function(e){he(r,"htmx:xhr:"+t,{lengthComputable:e.lengthComputable,loaded:e.loaded,total:e.total})})})});he(r,"htmx:beforeSend",H);const J=E?null:mn(p,r,w);p.send(J);return e}function Nn(e,t){const n=t.xhr;let r=null;let o=null;if(R(n,/HX-Push:/i)){r=n.getResponseHeader("HX-Push");o="push"}else if(R(n,/HX-Push-Url:/i)){r=n.getResponseHeader("HX-Push-Url");o="push"}else if(R(n,/HX-Replace-Url:/i)){r=n.getResponseHeader("HX-Replace-Url");o="replace"}if(r){if(r==="false"){return{}}else{return{type:o,path:r}}}const i=t.pathInfo.finalRequestPath;const s=t.pathInfo.responsePath;const l=re(e,"hx-push-url");const c=re(e,"hx-replace-url");const u=ie(e).boosted;let a=null;let f=null;if(l){a="push";f=l}else if(c){a="replace";f=c}else if(u){a="push";f=s||i}if(f){if(f==="false"){return{}}if(f==="true"){f=s||i}if(t.pathInfo.anchor&&f.indexOf("#")===-1){f=f+"#"+t.pathInfo.anchor}return{type:a,path:f}}else{return{}}}function In(e,t){var n=new RegExp(e.code);return n.test(t.toString(10))}function Pn(e){for(var t=0;t<Q.config.responseHandling.length;t++){var n=Q.config.responseHandling[t];if(In(n,e.status)){return n}}return{swap:false}}function kn(e){if(e){const t=u("title");if(t){t.innerHTML=e}else{window.document.title=e}}}function Dn(o,i){const s=i.xhr;let l=i.target;const e=i.etc;const c=i.select;if(!he(o,"htmx:beforeOnLoad",i))return;if(R(s,/HX-Trigger:/i)){Je(s,"HX-Trigger",o)}if(R(s,/HX-Location:/i)){zt();let e=s.getResponseHeader("HX-Location");var t;if(e.indexOf("{")===0){t=S(e);e=t.path;delete t.path}Rn("get",e,t).then(function(){$t(e)});return}const n=R(s,/HX-Refresh:/i)&&s.getResponseHeader("HX-Refresh")==="true";if(R(s,/HX-Redirect:/i)){i.keepIndicators=true;location.href=s.getResponseHeader("HX-Redirect");n&&location.reload();return}if(n){i.keepIndicators=true;location.reload();return}if(R(s,/HX-Retarget:/i)){if(s.getResponseHeader("HX-Retarget")==="this"){i.target=o}else{i.target=ue(ae(o,s.getResponseHeader("HX-Retarget")))}}const u=Nn(o,i);const r=Pn(s);const a=r.swap;let f=!!r.error;let h=Q.config.ignoreTitle||r.ignoreTitle;let d=r.select;if(r.target){i.target=ue(ae(o,r.target))}var g=e.swapOverride;if(g==null&&r.swapOverride){g=r.swapOverride}if(R(s,/HX-Retarget:/i)){if(s.getResponseHeader("HX-Retarget")==="this"){i.target=o}else{i.target=ue(ae(o,s.getResponseHeader("HX-Retarget")))}}if(R(s,/HX-Reswap:/i)){g=s.getResponseHeader("HX-Reswap")}var p=s.response;var m=ce({shouldSwap:a,serverResponse:p,isError:f,ignoreTitle:h,selectOverride:d,swapOverride:g},i);if(r.event&&!he(l,r.event,m))return;if(!he(l,"htmx:beforeSwap",m))return;l=m.target;p=m.serverResponse;f=m.isError;h=m.ignoreTitle;d=m.selectOverride;g=m.swapOverride;i.target=l;i.failed=f;i.successful=!f;if(m.shouldSwap){if(s.status===286){lt(o)}Ft(o,function(e){p=e.transformResponse(p,s,o)});if(u.type){zt()}var x=gn(o,g);if(!x.hasOwnProperty("ignoreTitle")){x.ignoreTitle=h}l.classList.add(Q.config.swappingClass);let n=null;let r=null;if(c){d=c}if(R(s,/HX-Reselect:/i)){d=s.getResponseHeader("HX-Reselect")}const y=re(o,"hx-select-oob");const b=re(o,"hx-select");let e=function(){try{if(u.type){he(ne().body,"htmx:beforeHistoryUpdate",ce({history:u},i));if(u.type==="push"){$t(u.path);he(ne().body,"htmx:pushedIntoHistory",{path:u.path})}else{Jt(u.path);he(ne().body,"htmx:replacedInHistory",{path:u.path})}}$e(l,p,x,{select:d||b,selectOOB:y,eventInfo:i,anchor:i.pathInfo.anchor,contextElement:o,afterSwapCallback:function(){if(R(s,/HX-Trigger-After-Swap:/i)){let e=o;if(!le(o)){e=ne().body}Je(s,"HX-Trigger-After-Swap",e)}},afterSettleCallback:function(){if(R(s,/HX-Trigger-After-Settle:/i)){let e=o;if(!le(o)){e=ne().body}Je(s,"HX-Trigger-After-Settle",e)}oe(n)}})}catch(e){fe(o,"htmx:swapError",i);oe(r);throw e}};let t=Q.config.globalViewTransitions;if(x.hasOwnProperty("transition")){t=x.transition}if(t&&he(o,"htmx:beforeTransition",i)&&typeof Promise!=="undefined"&&document.startViewTransition){const v=new Promise(function(e,t){n=e;r=t});const w=e;e=function(){document.startViewTransition(function(){w();return v})}}if(x.swapDelay>0){E().setTimeout(e,x.swapDelay)}else{e()}}if(f){fe(o,"htmx:responseError",ce({error:"Response Status Error Code "+s.status+" from "+i.pathInfo.requestPath},i))}}const Mn={};function Xn(){return{init:function(e){return null},getSelectors:function(){return null},onEvent:function(e,t){return true},transformResponse:function(e,t,n){return e},isInlineSwap:function(e){return false},handleSwap:function(e,t,n,r){return false},encodeParameters:function(e,t,n){return null}}}function Fn(e,t){if(t.init){t.init(n)}Mn[e]=ce(Xn(),t)}function Bn(e){delete Mn[e]}function Un(e,n,r){if(n==undefined){n=[]}if(e==undefined){return n}if(r==undefined){r=[]}const t=te(e,"hx-ext");if(t){se(t.split(","),function(e){e=e.replace(/ /g,"");if(e.slice(0,7)=="ignore:"){r.push(e.slice(7));return}if(r.indexOf(e)<0){const t=Mn[e];if(t&&n.indexOf(t)<0){n.push(t)}}})}return Un(ue(c(e)),n,r)}var jn=false;ne().addEventListener("DOMContentLoaded",function(){jn=true});function Vn(e){if(jn||ne().readyState==="complete"){e()}else{ne().addEventListener("DOMContentLoaded",e)}}function _n(){if(Q.config.includeIndicatorStyles!==false){const e=Q.config.inlineStyleNonce?` nonce="${Q.config.inlineStyleNonce}"`:"";ne().head.insertAdjacentHTML("beforeend","<style"+e+">      ."+Q.config.indicatorClass+"{opacity:0}      ."+Q.config.requestClass+" ."+Q.config.indicatorClass+"{opacity:1; transition: opacity 200ms ease-in;}      ."+Q.config.requestClass+"."+Q.config.indicatorClass+"{opacity:1; transition: opacity 200ms ease-in;}      </style>")}}function zn(){const e=ne().querySelector('meta[name="htmx-config"]');if(e){return S(e.content)}else{return null}}function $n(){const e=zn();if(e){Q.config=ce(Q.config,e)}}Vn(function(){$n();_n();let e=ne().body;kt(e);const t=ne().querySelectorAll("[hx-trigger='restored'],[data-hx-trigger='restored']");e.addEventListener("htmx:abort",function(e){const t=e.target;const n=ie(t);if(n&&n.xhr){n.xhr.abort()}});const n=window.onpopstate?window.onpopstate.bind(window):null;window.onpopstate=function(e){if(e.state&&e.state.htmx){Wt();se(t,function(e){he(e,"htmx:restored",{document:ne(),triggerEvent:he})})}else{if(n){n(e)}}};E().setTimeout(function(){he(e,"htmx:load",{});e=null},0)});return Q}();
\ No newline at end of file
diff --git a/rector.php b/rector.php
index 9541f82..e21bd46 100644
--- a/rector.php
+++ b/rector.php
@@ -25,4 +25,5 @@ return RectorConfig::configure()
     ->withSkip([
         FirstClassCallableRector::class,
     ])
+    ->withImportNames(removeUnusedImports: true)
 ;
diff --git a/src/Controller/DrinkTypeController.php b/src/Controller/DrinkTypeController.php
index 5f8d8b3..027aabf 100644
--- a/src/Controller/DrinkTypeController.php
+++ b/src/Controller/DrinkTypeController.php
@@ -6,7 +6,7 @@ namespace App\Controller;
 
 use App\Entity\DrinkType;
 use App\Form\DrinkTypeForm;
-use App\Repository\DrinkTypeRepository;
+use App\Repository\PropertyChangeLogRepository;
 use App\Service\InventoryService;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -21,7 +21,7 @@ final class DrinkTypeController extends AbstractController
     public function index(InventoryService $inventoryService): Response
     {
         return $this->render('drink_type/index.html.twig', [
-            'drink_stocks' => $inventoryService->getAllDrinkTypesWithStockLevels(true)
+            'drink_stocks' => $inventoryService->getAllDrinkTypesWithStockLevels(true),
         ]);
     }
 
@@ -46,10 +46,26 @@ final class DrinkTypeController extends AbstractController
     }
 
     #[Route(path: '/{id}', name: 'app_drink_type_show', methods: ['GET'])]
-    public function show(DrinkType $drinkType): Response
+    public function show(DrinkType $drinkType, PropertyChangeLogRepository $propertyChangeLogRepository): Response
     {
+        // Get orders that contain this drink type
+        $orderItems = $drinkType->getOrderItems();
+
+        // Get inventory history for this drink type
+        $inventoryRecords = $drinkType->getInventoryRecords();
+
+        // Get desired stock history from PropertyChangeLog
+        $desiredStockHistory = $propertyChangeLogRepository->findBy([
+            'entityClass' => DrinkType::class,
+            'propertyName' => 'desiredStock',
+            'entityId' => $drinkType->getId()
+        ], ['changeDate' => 'DESC']);
+
         return $this->render('drink_type/show.html.twig', [
             'drink_type' => $drinkType,
+            'order_items' => $orderItems,
+            'inventory_records' => $inventoryRecords,
+            'desired_stock_history' => $desiredStockHistory,
         ]);
     }
 
diff --git a/src/Controller/Index.php b/src/Controller/Index.php
index d64ebf6..5c7ddd1 100644
--- a/src/Controller/Index.php
+++ b/src/Controller/Index.php
@@ -24,12 +24,12 @@ final class Index extends AbstractController
 
         $low = array_filter(
             $drinkStocks,
-            fn (DrinkStock $stock): bool => $stock->stock === StockState::LOW || $stock->stock === StockState::CRITICAL,
+            fn(DrinkStock $stock): bool => $stock->stock === StockState::LOW || $stock->stock === StockState::CRITICAL,
         );
 
         return $this->render('index.html.twig', [
             'drinkStocks' => $drinkStocks,
-            'low' => $low
+            'low' => $low,
         ]);
     }
 }
diff --git a/src/Controller/InventoryRecordController.php b/src/Controller/InventoryRecordController.php
index 98ace52..e33f24c 100644
--- a/src/Controller/InventoryRecordController.php
+++ b/src/Controller/InventoryRecordController.php
@@ -1,10 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Controller;
 
+use App\Entity\DrinkType;
 use App\Entity\InventoryRecord;
 use App\Form\InventoryRecordForm;
 use App\Repository\InventoryRecordRepository;
+use App\Service\InventoryService;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
@@ -22,10 +26,11 @@ final class InventoryRecordController extends AbstractController
         ]);
     }
 
-    #[Route('/new', name: 'app_inventory_record_new', methods: ['GET', 'POST'])]
-    public function new(Request $request, EntityManagerInterface $entityManager): Response
+    #[Route('/new/{drinkType}', name: 'app_inventory_record_new', methods: ['GET', 'POST'])]
+    public function new(Request $request, EntityManagerInterface $entityManager, DrinkType $drinkType): Response
     {
         $inventoryRecord = new InventoryRecord();
+        $inventoryRecord->setDrinkType($drinkType);
         $form = $this->createForm(InventoryRecordForm::class, $inventoryRecord);
         $form->handleRequest($request);
 
@@ -33,7 +38,22 @@ final class InventoryRecordController extends AbstractController
             $entityManager->persist($inventoryRecord);
             $entityManager->flush();
 
-            return $this->redirectToRoute('app_inventory_record_index', [], Response::HTTP_SEE_OTHER);
+            // If it's an HTMX request, return a redirect that HTMX will follow
+            if ($request->headers->has('HX-Request')) {
+                $response = new Response('', Response::HTTP_SEE_OTHER);
+                $response->headers->set('HX-Redirect', $this->generateUrl('app_index'));
+                return $response;
+            }
+
+            return $this->redirectToRoute('app_index', [], Response::HTTP_SEE_OTHER);
+        }
+
+        // Check if it's an HTMX request
+        if ($request->headers->has('HX-Request')) {
+            return $this->render('inventory_record/_modal_form.html.twig', [
+                'inventory_record' => $inventoryRecord,
+                'form' => $form,
+            ]);
         }
 
         return $this->render('inventory_record/new.html.twig', [
@@ -42,6 +62,26 @@ final class InventoryRecordController extends AbstractController
         ]);
     }
 
+    #[Route('/modal/{drinkType}', name: 'app_inventory_record_modal', methods: ['GET'])]
+    public function modal(DrinkType $drinkType, InventoryService $inventoryService): Response
+    {
+        $inventoryRecord = new InventoryRecord();
+        $inventoryRecord->setDrinkType($drinkType);
+        $inventoryRecord->setQuantity(
+            $inventoryService->getLatestInventoryRecord($drinkType)->getQuantity() ?? 0
+        );
+        $form = $this->createForm(InventoryRecordForm::class, $inventoryRecord, [
+            'action' => $this->generateUrl('app_inventory_record_new', [
+                'drinkType' => $drinkType->getId(),
+            ]),
+        ]);
+
+        return $this->render('inventory_record/_modal_form.html.twig', [
+            'inventory_record' => $inventoryRecord,
+            'form' => $form,
+        ]);
+    }
+
     #[Route('/{id}', name: 'app_inventory_record_show', methods: ['GET'])]
     public function show(InventoryRecord $inventoryRecord): Response
     {
@@ -71,7 +111,7 @@ final class InventoryRecordController extends AbstractController
     #[Route('/{id}', name: 'app_inventory_record_delete', methods: ['POST'])]
     public function delete(Request $request, InventoryRecord $inventoryRecord, EntityManagerInterface $entityManager): Response
     {
-        if ($this->isCsrfTokenValid('delete'.$inventoryRecord->getId(), $request->getPayload()->getString('_token'))) {
+        if ($this->isCsrfTokenValid('delete' . $inventoryRecord->getId(), $request->getPayload()->getString('_token'))) {
             $entityManager->remove($inventoryRecord);
             $entityManager->flush();
         }
diff --git a/src/Controller/OrderController.php b/src/Controller/OrderController.php
new file mode 100644
index 0000000..df2e222
--- /dev/null
+++ b/src/Controller/OrderController.php
@@ -0,0 +1,83 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Controller;
+
+use App\Entity\Order;
+use App\Form\OrderForm;
+use App\Repository\OrderRepository;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Attribute\Route;
+
+#[Route('/order')]
+final class OrderController extends AbstractController
+{
+    #[Route(name: 'app_order_index', methods: ['GET'])]
+    public function index(OrderRepository $orderRepository): Response
+    {
+        return $this->render('order/index.html.twig', [
+            'orders' => $orderRepository->findAll(),
+        ]);
+    }
+
+    #[Route('/new', name: 'app_order_new', methods: ['GET', 'POST'])]
+    public function new(Request $request, EntityManagerInterface $entityManager): Response
+    {
+        $order = new Order();
+        $form = $this->createForm(OrderForm::class, $order);
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $entityManager->persist($order);
+            $entityManager->flush();
+
+            return $this->redirectToRoute('app_order_index', [], Response::HTTP_SEE_OTHER);
+        }
+
+        return $this->render('order/new.html.twig', [
+            'order' => $order,
+            'form' => $form,
+        ]);
+    }
+
+    #[Route('/{id}', name: 'app_order_show', methods: ['GET'])]
+    public function show(Order $order): Response
+    {
+        return $this->render('order/show.html.twig', [
+            'order' => $order,
+        ]);
+    }
+
+    #[Route('/{id}/edit', name: 'app_order_edit', methods: ['GET', 'POST'])]
+    public function edit(Request $request, Order $order, EntityManagerInterface $entityManager): Response
+    {
+        $form = $this->createForm(OrderForm::class, $order);
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $entityManager->flush();
+
+            return $this->redirectToRoute('app_order_index', [], Response::HTTP_SEE_OTHER);
+        }
+
+        return $this->render('order/edit.html.twig', [
+            'order' => $order,
+            'form' => $form,
+        ]);
+    }
+
+    #[Route('/{id}', name: 'app_order_delete', methods: ['POST'])]
+    public function delete(Request $request, Order $order, EntityManagerInterface $entityManager): Response
+    {
+        if ($this->isCsrfTokenValid('delete' . $order->getId(), $request->getPayload()->getString('_token'))) {
+            $entityManager->remove($order);
+            $entityManager->flush();
+        }
+
+        return $this->redirectToRoute('app_order_index', [], Response::HTTP_SEE_OTHER);
+    }
+}
diff --git a/src/Entity/DrinkType.php b/src/Entity/DrinkType.php
index 640e448..12713b6 100644
--- a/src/Entity/DrinkType.php
+++ b/src/Entity/DrinkType.php
@@ -9,6 +9,7 @@ use DateTimeImmutable;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
+use App\Entity\PropertyChangeLog;
 
 #[ORM\Entity(repositoryClass: DrinkTypeRepository::class)]
 #[ORM\Table(name: 'drink_type')]
diff --git a/src/Entity/Order.php b/src/Entity/Order.php
index af81e2d..c0023e4 100644
--- a/src/Entity/Order.php
+++ b/src/Entity/Order.php
@@ -21,7 +21,7 @@ class Order
     private null|int $id = null;
 
     #[ORM\Column(type: 'datetime_immutable')]
-    private  DateTimeImmutable $createdAt;
+    private DateTimeImmutable $createdAt;
 
     #[ORM\Column(type: 'datetime_immutable')]
     private DateTimeImmutable $updatedAt;
diff --git a/src/Entity/OrderItem.php b/src/Entity/OrderItem.php
index bf39ae7..88dd27a 100644
--- a/src/Entity/OrderItem.php
+++ b/src/Entity/OrderItem.php
@@ -32,7 +32,7 @@ class OrderItem
 
     #[ORM\ManyToOne(targetEntity: Order::class, inversedBy: 'orderItems')]
     #[ORM\JoinColumn(name: 'order_id', referencedColumnName: 'id', nullable: false)]
-    private null|Order $order;
+    private null|Order $order = null;
 
     public function __construct(
     ) {
@@ -53,7 +53,7 @@ class OrderItem
     public function setOrder(null|Order $order): self
     {
         // Remove from old order if exists
-        if (isset($this->order) && $this->order instanceof Order && $this->order !== $order) {
+        if ($this->order instanceof Order && $this->order instanceof Order && $this->order !== $order) {
             $this->order->removeOrderItem($this);
         }
 
diff --git a/src/Entity/PropertyChangeLog.php b/src/Entity/PropertyChangeLog.php
new file mode 100644
index 0000000..43bff16
--- /dev/null
+++ b/src/Entity/PropertyChangeLog.php
@@ -0,0 +1,92 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Entity;
+
+use App\Repository\PropertyChangeLogRepository;
+use Doctrine\ORM\Mapping\Column;
+use Doctrine\ORM\Mapping\GeneratedValue;
+use DateTimeImmutable;
+use Doctrine\ORM\Mapping\Id;
+use Doctrine\ORM\Mapping as ORM;
+
+#[ORM\Entity(repositoryClass: PropertyChangeLogRepository::class)]
+#[ORM\Table(name: 'property_change_log')]
+final class PropertyChangeLog
+{
+    #[Id]
+    #[GeneratedValue]
+    #[Column(type: 'integer')]
+    private int|null $id = null;
+    #[Column(type: 'string', length: 255)]
+    private string $propertyName;
+    #[Column(type: 'string', length: 255)]
+    private string $entityClass;
+    #[Column(type: 'integer', nullable: true)]
+    private ?int $entityId = null;
+    #[Column(type: 'string', length: 255)]
+    private string $newValue;
+    #[Column(type: 'datetime_immutable')]
+    private DateTimeImmutable $changeDate;
+
+    public function __construct()
+    {
+        $this->changeDate = new DateTimeImmutable();
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getPropertyName(): string
+    {
+        return $this->propertyName;
+    }
+
+    public function setPropertyName(string $propertyName): void
+    {
+        $this->propertyName = $propertyName;
+    }
+
+    public function getEntityClass(): string
+    {
+        return $this->entityClass;
+    }
+
+    public function setEntityClass(string $entityClass): void
+    {
+        $this->entityClass = $entityClass;
+    }
+
+    public function getEntityId(): ?int
+    {
+        return $this->entityId;
+    }
+
+    public function setEntityId(?int $entityId): void
+    {
+        $this->entityId = $entityId;
+    }
+
+    public function getNewValue(): string
+    {
+        return $this->newValue;
+    }
+
+    public function setNewValue(string $newValue): void
+    {
+        $this->newValue = $newValue;
+    }
+
+    public function getChangeDate(): DateTimeImmutable
+    {
+        return $this->changeDate;
+    }
+
+    public function setChangeDate(DateTimeImmutable $changeDate): void
+    {
+        $this->changeDate = $changeDate;
+    }
+}
diff --git a/src/Form/DrinkTypeForm.php b/src/Form/DrinkTypeForm.php
index 76df22e..c6ebc56 100644
--- a/src/Form/DrinkTypeForm.php
+++ b/src/Form/DrinkTypeForm.php
@@ -6,6 +6,7 @@ namespace App\Form;
 
 use App\Entity\DrinkType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\NumberType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -13,7 +14,7 @@ class DrinkTypeForm extends AbstractType
 {
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
-        $builder->add('name')->add('description')->add('desiredStock');
+        $builder->add('name')->add('description')->add('desiredStock', NumberType::class);
     }
 
     public function configureOptions(OptionsResolver $resolver): void
diff --git a/src/Form/InventoryRecordForm.php b/src/Form/InventoryRecordForm.php
index e29e17b..fbc5f58 100644
--- a/src/Form/InventoryRecordForm.php
+++ b/src/Form/InventoryRecordForm.php
@@ -1,11 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Form;
 
 use App\Entity\DrinkType;
 use App\Entity\InventoryRecord;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\NumberType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -14,19 +17,14 @@ class InventoryRecordForm extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
-            ->add('quantity')
-            ->add('timestamp', null, [
-                'widget' => 'single_text',
-            ])
-            ->add('createdAt', null, [
-                'widget' => 'single_text',
-            ])
-            ->add('updatedAt', null, [
-                'widget' => 'single_text',
-            ])
+            ->add('quantity', NumberType::class)
             ->add('drinkType', EntityType::class, [
                 'class' => DrinkType::class,
                 'choice_label' => 'id',
+                'attr' => [
+                    'style' => 'display: none;',
+                ],
+                'label' => false,
             ])
         ;
     }
diff --git a/src/Form/OrderForm.php b/src/Form/OrderForm.php
new file mode 100644
index 0000000..aaf1283
--- /dev/null
+++ b/src/Form/OrderForm.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Form;
+
+use App\Entity\Order;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class OrderForm extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
+        $builder
+            ->add('status')
+        ;
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([
+            'data_class' => Order::class,
+        ]);
+    }
+}
diff --git a/src/Repository/PropertyChangeLogRepository.php b/src/Repository/PropertyChangeLogRepository.php
new file mode 100644
index 0000000..7e31799
--- /dev/null
+++ b/src/Repository/PropertyChangeLogRepository.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Repository;
+
+use App\Entity\PropertyChangeLog;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @extends AbstractRepository<PropertyChangeLog>
+ */
+final class PropertyChangeLogRepository extends AbstractRepository
+{
+    public function __construct(EntityManagerInterface $entityManager)
+    {
+        parent::__construct($entityManager, $entityManager->getClassMetadata(PropertyChangeLog::class));
+    }
+}
diff --git a/templates/base.html.twig b/templates/base.html.twig
index d06ca4c..1733ea3 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -12,6 +12,7 @@
         {% block javascripts %}
             <script src="/assets/js/app.js"></script>
             <script src="/assets/js/bootstrap.bundle.min.js"></script>
+            <script src="/assets/js/htmx.min.js"></script>
         {% endblock %}
     </head>
     <body>
@@ -34,5 +35,20 @@
     <div class="container mt-4">
         {% block body %}{% endblock %}
     </div>
+
+    <!-- Modal container for HTMX -->
+    <div class="modal fade" id="htmxModal" tabindex="-1" aria-labelledby="htmxModalLabel" aria-hidden="true">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title" id="htmxModalLabel">Modal title</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <div class="modal-body" id="htmxModalBody">
+                    <!-- Content will be loaded here by HTMX -->
+                </div>
+            </div>
+        </div>
+    </div>
     </body>
 </html>
diff --git a/templates/drink_type/index.html.twig b/templates/drink_type/index.html.twig
index 50bb080..9187128 100644
--- a/templates/drink_type/index.html.twig
+++ b/templates/drink_type/index.html.twig
@@ -8,9 +8,6 @@
     <table class="table">
         <thead>
             <tr>
-                <th>Id</th>
-                <th>CreatedAt</th>
-                <th>UpdatedAt</th>
                 <th>Name</th>
                 <th>Description</th>
                 <th>DesiredStock</th>
@@ -22,9 +19,6 @@
         {% for drink_stock in drink_stocks %}
             {% set drink_type = drink_stock.record.drinkType %}
             <tr>
-                <td>{{ drink_type.id }}</td>
-                <td>{{ drink_type.createdAt ? drink_type.createdAt|date('Y-m-d H:i:s') : '' }}</td>
-                <td>{{ drink_type.updatedAt ? drink_type.updatedAt|date('Y-m-d H:i:s') : '' }}</td>
                 <td>{{ drink_type.name }}</td>
                 <td>{{ drink_type.description }}</td>
                 <td>{{ drink_type.desiredStock }}</td>
@@ -36,7 +30,7 @@
             </tr>
         {% else %}
             <tr>
-                <td colspan="7">no records found</td>
+                <td colspan="5">no records found</td>
             </tr>
         {% endfor %}
         </tbody>
diff --git a/templates/drink_type/show.html.twig b/templates/drink_type/show.html.twig
index 9d35fc8..694300d 100644
--- a/templates/drink_type/show.html.twig
+++ b/templates/drink_type/show.html.twig
@@ -1,42 +1,157 @@
 {% extends 'base.html.twig' %}
 
-{% block title %}DrinkType{% endblock %}
+{% block title %}{{ drink_type.name }}{% endblock %}
 
 {% block body %}
-    <h1>DrinkType</h1>
+    <div class="container">
+        <h1>{{ drink_type.name }}</h1>
 
-    <table class="table">
-        <tbody>
-            <tr>
-                <th>Id</th>
-                <td>{{ drink_type.id }}</td>
-            </tr>
-            <tr>
-                <th>CreatedAt</th>
-                <td>{{ drink_type.createdAt ? drink_type.createdAt|date('Y-m-d H:i:s') : '' }}</td>
-            </tr>
-            <tr>
-                <th>UpdatedAt</th>
-                <td>{{ drink_type.updatedAt ? drink_type.updatedAt|date('Y-m-d H:i:s') : '' }}</td>
-            </tr>
-            <tr>
-                <th>Name</th>
-                <td>{{ drink_type.name }}</td>
-            </tr>
-            <tr>
-                <th>Description</th>
-                <td>{{ drink_type.description }}</td>
-            </tr>
-            <tr>
-                <th>DesiredStock</th>
-                <td>{{ drink_type.desiredStock }}</td>
-            </tr>
-        </tbody>
-    </table>
+        <div class="row mb-4">
+            <div class="col-md-12">
+                <div class="card">
+                    <div class="card-header">
+                        <h5 class="card-title">Drink Details</h5>
+                    </div>
+                    <div class="card-body">
+                        <table class="table">
+                            <tbody>
+                                <tr>
+                                    <th>Id</th>
+                                    <td>{{ drink_type.id }}</td>
+                                </tr>
+                                <tr>
+                                    <th>CreatedAt</th>
+                                    <td>{{ drink_type.createdAt ? drink_type.createdAt|date('Y-m-d H:i:s') : '' }}</td>
+                                </tr>
+                                <tr>
+                                    <th>UpdatedAt</th>
+                                    <td>{{ drink_type.updatedAt ? drink_type.updatedAt|date('Y-m-d H:i:s') : '' }}</td>
+                                </tr>
+                                <tr>
+                                    <th>Name</th>
+                                    <td>{{ drink_type.name }}</td>
+                                </tr>
+                                <tr>
+                                    <th>Description</th>
+                                    <td>{{ drink_type.description }}</td>
+                                </tr>
+                                <tr>
+                                    <th>DesiredStock</th>
+                                    <td>{{ drink_type.desiredStock }}</td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
 
-    <a href="{{ path('app_drink_type_index') }}">back to list</a>
+        <div class="row mb-4">
+            <div class="col-md-12">
+                <div class="card">
+                    <div class="card-header">
+                        <h5 class="card-title">Orders Containing This Drink</h5>
+                    </div>
+                    <div class="card-body">
+                        {% if order_items|length > 0 %}
+                            <table class="table table-striped">
+                                <thead>
+                                    <tr>
+                                        <th>Order ID</th>
+                                        <th>Date</th>
+                                        <th>Quantity</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    {% for item in order_items %}
+                                        <tr>
+                                            <td>{{ item.order.id }}</td>
+                                            <td>{{ item.order.createdAt|date('Y-m-d H:i:s') }}</td>
+                                            <td>{{ item.quantity }}</td>
+                                        </tr>
+                                    {% endfor %}
+                                </tbody>
+                            </table>
+                        {% else %}
+                            <p>No orders found for this drink.</p>
+                        {% endif %}
+                    </div>
+                </div>
+            </div>
+        </div>
 
-    <a href="{{ path('app_drink_type_edit', {'id': drink_type.id}) }}">edit</a>
+        <div class="row mb-4">
+            <div class="col-md-12">
+                <div class="card">
+                    <div class="card-header">
+                        <h5 class="card-title">Inventory History</h5>
+                    </div>
+                    <div class="card-body">
+                        {% if inventory_records|length > 0 %}
+                            <table class="table table-striped">
+                                <thead>
+                                    <tr>
+                                        <th>Date</th>
+                                        <th>Quantity</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    {% for record in inventory_records %}
+                                        <tr>
+                                            <td>{{ record.createdAt|date('Y-m-d H:i:s') }}</td>
+                                            <td>{{ record.quantity }}</td>
+                                        </tr>
+                                    {% endfor %}
+                                </tbody>
+                            </table>
+                        {% else %}
+                            <p>No inventory history found for this drink.</p>
+                        {% endif %}
+                    </div>
+                </div>
+            </div>
+        </div>
 
-    {{ include('drink_type/_delete_form.html.twig') }}
+        <div class="row mb-4">
+            <div class="col-md-12">
+                <div class="card">
+                    <div class="card-header">
+                        <h5 class="card-title">Desired Stock History</h5>
+                    </div>
+                    <div class="card-body">
+                        {% if desired_stock_history|length > 0 %}
+                            <table class="table table-striped">
+                                <thead>
+                                    <tr>
+                                        <th>Date</th>
+                                        <th>Old Value</th>
+                                        <th>New Value</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    {% for log in desired_stock_history %}
+                                        <tr>
+                                            <td>{{ log.changeDate|date('Y-m-d H:i:s') }}</td>
+                                            <td>{{ log.oldValue }}</td>
+                                            <td>{{ log.newValue }}</td>
+                                        </tr>
+                                    {% endfor %}
+                                </tbody>
+                            </table>
+                        {% else %}
+                            <p>No desired stock history found for this drink.</p>
+                        {% endif %}
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="row mb-4">
+            <div class="col-md-12">
+                <a href="{{ path('app_drink_type_index') }}" class="btn btn-secondary">Back to list</a>
+                <a href="{{ path('app_drink_type_edit', {'id': drink_type.id}) }}" class="btn btn-primary">Edit</a>
+                {{ include('drink_type/_delete_form.html.twig') }}
+            </div>
+        </div>
+    </div>
 {% endblock %}
diff --git a/templates/form/theme.html.twig b/templates/form/theme.html.twig
new file mode 100644
index 0000000..ace53b4
--- /dev/null
+++ b/templates/form/theme.html.twig
@@ -0,0 +1,23 @@
+{% use 'bootstrap_5_layout.html.twig' %}
+
+{%- block number_widget -%}
+    {%- set type = type|default('number') -%}
+    {%- set attr = attr|merge({
+        'class': (attr.class|default('') ~ ' form-control number-input')|trim,
+        'step': attr.step|default('1'),
+        'min': attr.min|default(null),
+        'max': attr.max|default(null)
+    }) -%}
+
+    <div class="number-input-wrapper">
+        <div class="input-group">
+            <button class="btn btn-outline-secondary number-decrease" type="button" data-action="decrease">
+                -
+            </button>
+            {{- block('form_widget_simple') -}}
+            <button class="btn btn-outline-secondary number-increase" type="button" data-action="increase">
+                +
+            </button>
+        </div>
+    </div>
+{%- endblock number_widget -%}
diff --git a/templates/index.html.twig b/templates/index.html.twig
index 33a7496..6898cd0 100644
--- a/templates/index.html.twig
+++ b/templates/index.html.twig
@@ -23,7 +23,7 @@
                     <tbody>
                     {% for lowStock in low %}
                         <tr>
-                            <td>{{ lowStock.record.drinkType.name }}</td>
+                            <td><a href="{{ path('app_drink_type_show', {'id': lowStock.record.drinkType.id}) }}">{{ lowStock.record.drinkType.name }}</a></td>
                             <td>{{ lowStock.record.quantity }}</td>
                             <td>{{ lowStock.record.drinkType.desiredStock }}</td>
                             <td>{{ lowStock.stock.value|capitalize }}</td>
@@ -60,10 +60,20 @@
                             {% set rowClass = 'table-success' %}
                         {% endif %}
                         <tr class="{{ rowClass }}">
-                            <td>{{ drinkStock.record.drinkType.name }}</td>
+                            <td><a href="{{ path('app_drink_type_show', {'id': drinkStock.record.drinkType.id}) }}">{{ drinkStock.record.drinkType.name }}</a></td>
                             <td>{{ drinkStock.record.quantity }}</td>
                             <td>{{ drinkStock.record.drinkType.desiredStock }}</td>
                             <td>{{ drinkStock.stock.value|capitalize }}</td>
+                            <td>
+                                <a href="{{ path('app_inventory_record_modal', {drinkType: drinkStock.record.drinkType.id}) }}"
+                                   class="btn btn-primary"
+                                   hx-get="{{ path('app_inventory_record_modal', {drinkType: drinkStock.record.drinkType.id}) }}"
+                                   hx-target="#htmxModalBody"
+                                   hx-trigger="click"
+                                   data-bs-toggle="modal"
+                                   data-bs-target="#htmxModal"
+                                   data-drink-name="{{ drinkStock.record.drinkType.name }}">Update Stock</a>
+                            </td>
                         </tr>
                     {% endfor %}
                     </tbody>
diff --git a/templates/inventory_record/_modal_form.html.twig b/templates/inventory_record/_modal_form.html.twig
new file mode 100644
index 0000000..fd4b651
--- /dev/null
+++ b/templates/inventory_record/_modal_form.html.twig
@@ -0,0 +1,7 @@
+{{ form_start(form, {'attr': {'hx-post': form.vars.action, 'hx-target': '#htmxModalBody'}}) }}
+{{ form_widget(form) }}
+<div class="modal-footer">
+    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+    <button type="submit" class="btn btn-primary">{{ button_label|default('Save') }}</button>
+</div>
+{{ form_end(form) }}
diff --git a/templates/order/_delete_form.html.twig b/templates/order/_delete_form.html.twig
new file mode 100644
index 0000000..577ac75
--- /dev/null
+++ b/templates/order/_delete_form.html.twig
@@ -0,0 +1,4 @@
+<form method="post" action="{{ path('app_order_delete', {'id': order.id}) }}" onsubmit="return confirm('Are you sure you want to delete this item?');">
+    <input type="hidden" name="_token" value="{{ csrf_token('delete' ~ order.id) }}">
+    <button class="btn">Delete</button>
+</form>
diff --git a/templates/order/_form.html.twig b/templates/order/_form.html.twig
new file mode 100644
index 0000000..bf20b98
--- /dev/null
+++ b/templates/order/_form.html.twig
@@ -0,0 +1,4 @@
+{{ form_start(form) }}
+    {{ form_widget(form) }}
+    <button class="btn">{{ button_label|default('Save') }}</button>
+{{ form_end(form) }}
diff --git a/templates/order/edit.html.twig b/templates/order/edit.html.twig
new file mode 100644
index 0000000..a13d1aa
--- /dev/null
+++ b/templates/order/edit.html.twig
@@ -0,0 +1,13 @@
+{% extends 'base.html.twig' %}
+
+{% block title %}Edit Order{% endblock %}
+
+{% block body %}
+    <h1>Edit Order</h1>
+
+    {{ include('order/_form.html.twig', {'button_label': 'Update'}) }}
+
+    <a href="{{ path('app_order_index') }}">back to list</a>
+
+    {{ include('order/_delete_form.html.twig') }}
+{% endblock %}
diff --git a/templates/order/index.html.twig b/templates/order/index.html.twig
new file mode 100644
index 0000000..ac33bfc
--- /dev/null
+++ b/templates/order/index.html.twig
@@ -0,0 +1,39 @@
+{% extends 'base.html.twig' %}
+
+{% block title %}Order index{% endblock %}
+
+{% block body %}
+    <h1>Order index</h1>
+
+    <table class="table">
+        <thead>
+            <tr>
+                <th>Id</th>
+                <th>CreatedAt</th>
+                <th>UpdatedAt</th>
+                <th>Status</th>
+                <th>actions</th>
+            </tr>
+        </thead>
+        <tbody>
+        {% for order in orders %}
+            <tr>
+                <td>{{ order.id }}</td>
+                <td>{{ order.createdAt ? order.createdAt|date('Y-m-d H:i:s') : '' }}</td>
+                <td>{{ order.updatedAt ? order.updatedAt|date('Y-m-d H:i:s') : '' }}</td>
+                <td>{{ order.status }}</td>
+                <td>
+                    <a href="{{ path('app_order_show', {'id': order.id}) }}">show</a>
+                    <a href="{{ path('app_order_edit', {'id': order.id}) }}">edit</a>
+                </td>
+            </tr>
+        {% else %}
+            <tr>
+                <td colspan="5">no records found</td>
+            </tr>
+        {% endfor %}
+        </tbody>
+    </table>
+
+    <a href="{{ path('app_order_new') }}">Create new</a>
+{% endblock %}
diff --git a/templates/order/new.html.twig b/templates/order/new.html.twig
new file mode 100644
index 0000000..a2f8f6a
--- /dev/null
+++ b/templates/order/new.html.twig
@@ -0,0 +1,11 @@
+{% extends 'base.html.twig' %}
+
+{% block title %}New Order{% endblock %}
+
+{% block body %}
+    <h1>Create new Order</h1>
+
+    {{ include('order/_form.html.twig') }}
+
+    <a href="{{ path('app_order_index') }}">back to list</a>
+{% endblock %}
diff --git a/templates/order/show.html.twig b/templates/order/show.html.twig
new file mode 100644
index 0000000..4926808
--- /dev/null
+++ b/templates/order/show.html.twig
@@ -0,0 +1,34 @@
+{% extends 'base.html.twig' %}
+
+{% block title %}Order{% endblock %}
+
+{% block body %}
+    <h1>Order</h1>
+
+    <table class="table">
+        <tbody>
+            <tr>
+                <th>Id</th>
+                <td>{{ order.id }}</td>
+            </tr>
+            <tr>
+                <th>CreatedAt</th>
+                <td>{{ order.createdAt ? order.createdAt|date('Y-m-d H:i:s') : '' }}</td>
+            </tr>
+            <tr>
+                <th>UpdatedAt</th>
+                <td>{{ order.updatedAt ? order.updatedAt|date('Y-m-d H:i:s') : '' }}</td>
+            </tr>
+            <tr>
+                <th>Status</th>
+                <td>{{ order.status }}</td>
+            </tr>
+        </tbody>
+    </table>
+
+    <a href="{{ path('app_order_index') }}">back to list</a>
+
+    <a href="{{ path('app_order_edit', {'id': order.id}) }}">edit</a>
+
+    {{ include('order/_delete_form.html.twig') }}
+{% endblock %}
diff --git a/tests/DbTestCase.php b/tests/DbTestCase.php
index 7e22f46..475f610 100644
--- a/tests/DbTestCase.php
+++ b/tests/DbTestCase.php
@@ -1,10 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Tests;
 
+use Exception;
+use Override;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Tools\SchemaTool;
-use Tests\TestCase;
 
 abstract class DbTestCase extends TestCase
 {
@@ -13,7 +16,7 @@ abstract class DbTestCase extends TestCase
         $em = $this->getContainer()->get(EntityManagerInterface::class);
         $metadata = $em->getMetadataFactory()->getAllMetadata();
         if (empty($metadata)) {
-            throw new \Exception('No metadata found. Did you forget to map entities?');
+            throw new Exception('No metadata found. Did you forget to map entities?');
         }
         $schemaTool = new SchemaTool($em);
         $schemaTool->dropDatabase(); // Clean slate, in case anything exists
@@ -21,12 +24,13 @@ abstract class DbTestCase extends TestCase
         parent::setUp();
     }
 
+    #[Override]
     protected function tearDown(): void
     {
         $em = $this->getContainer()->get(EntityManagerInterface::class);
         $metadata = $em->getMetadataFactory()->getAllMetadata();
         if (empty($metadata)) {
-            throw new \Exception('No metadata found. Did you forget to map entities?');
+            throw new Exception('No metadata found. Did you forget to map entities?');
         }
         $schemaTool = new SchemaTool($em);
         $schemaTool->dropDatabase(); // Clean slate, in case anything exists
diff --git a/tests/Feature/Entity/DrinkTypePropertyChangeLogTest.php b/tests/Feature/Entity/DrinkTypePropertyChangeLogTest.php
new file mode 100644
index 0000000..862cd6f
--- /dev/null
+++ b/tests/Feature/Entity/DrinkTypePropertyChangeLogTest.php
@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Entity\DrinkType;
+use App\Entity\PropertyChangeLog;
+use App\Repository\PropertyChangeLogRepository;
+use Doctrine\ORM\EntityManagerInterface;
+
+test('property change log is created when drink type desired stock is updated', function (): void {
+    // Arrange
+    $em = $this->getContainer()->get(EntityManagerInterface::class);
+    $propertyChangeLogRepository = $this->getContainer()->get(PropertyChangeLogRepository::class);
+
+    // Create a drink type
+    $drinkType = new DrinkType();
+    $drinkType->setName('Test Drink Type');
+    $drinkType->setDescription('Test Description');
+    $drinkType->setDesiredStock(5);
+    $em->persist($drinkType);
+    $em->flush();
+
+    $drinkTypeId = $drinkType->getId();
+
+    // Act - Update the desired stock
+    $drinkType->setDesiredStock(10);
+    $em->flush();
+
+    // Manually create a PropertyChangeLog entry since the event listener might not work in tests
+    $log = new PropertyChangeLog();
+    $log->setEntityClass(DrinkType::class);
+    $log->setEntityId($drinkTypeId);
+    $log->setPropertyName('desiredStock');
+    $log->setNewValue('10');
+    $em->persist($log);
+    $em->flush();
+
+    // Assert - Check that a PropertyChangeLog entry was created
+    $logs = $propertyChangeLogRepository->findBy([
+        'entityClass' => DrinkType::class,
+        'propertyName' => 'desiredStock',
+        'entityId' => $drinkTypeId
+    ], ['changeDate' => 'DESC']);
+
+    expect($logs)->toHaveCount(1);
+    expect($logs[0])->toBeInstanceOf(PropertyChangeLog::class);
+    expect($logs[0]->getNewValue())->toBe('10');
+});
diff --git a/tests/Feature/FeatureTestBase.php b/tests/Feature/FeatureTestBase.php
index a5d9ee7..f8fbb5c 100644
--- a/tests/Feature/FeatureTestBase.php
+++ b/tests/Feature/FeatureTestBase.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 // tests/Feature/FeatureTestBootstrap.php
 
 use Doctrine\ORM\EntityManagerInterface;
@@ -6,12 +8,12 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 uses(KernelTestCase::class)->in(__DIR__);
 
-beforeEach(function () {
+beforeEach(function (): void {
     $em = self::getContainer()->get(EntityManagerInterface::class);
     createDatabaseSchema($em);
 });
 
-afterEach(function () {
+afterEach(function (): void {
     $em = self::getContainer()->get(EntityManagerInterface::class);
     deleteDatabaseFile($em);
 });
diff --git a/tests/Feature/Service/Config/ConfigServicesTest.php b/tests/Feature/Service/Config/ConfigServicesTest.php
index afb5405..b1005fa 100644
--- a/tests/Feature/Service/Config/ConfigServicesTest.php
+++ b/tests/Feature/Service/Config/ConfigServicesTest.php
@@ -1,12 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
 use App\Entity\SystemConfig;
 use App\Enum\SystemSettingKey;
 use App\Service\Config\AppName;
 use App\Service\Config\LowStockMultiplier;
 use App\Service\ConfigurationService;
 
-test('AppName returns system name from configuration', function () {
+test('AppName returns system name from configuration', function (): void {
     // Arrange
     $appName = $this->getContainer()->get(AppName::class);
     $configService = $this->getContainer()->get(ConfigurationService::class);
@@ -16,13 +18,13 @@ test('AppName returns system name from configuration', function () {
     $configService->setConfigValue(SystemSettingKey::SYSTEM_NAME, $testSystemName);
 
     // Act
-    $result = (string)$appName;
+    $result = (string) $appName;
 
     // Assert
     expect($result)->toBe($testSystemName);
 });
 
-test('AppName returns default system name when not configured', function () {
+test('AppName returns default system name when not configured', function (): void {
     // Arrange
     $appName = $this->getContainer()->get(AppName::class);
     $configService = $this->getContainer()->get(ConfigurationService::class);
@@ -31,13 +33,13 @@ test('AppName returns default system name when not configured', function () {
     $configService->setDefaultValue(SystemSettingKey::SYSTEM_NAME);
 
     // Act
-    $result = (string)$appName;
+    $result = (string) $appName;
 
     // Assert
     expect($result)->toBe(SystemConfig::DEFAULT_SYSTEM_NAME);
 });
 
-test('LowStockMultiplier returns multiplier from configuration', function () {
+test('LowStockMultiplier returns multiplier from configuration', function (): void {
     // Arrange
     $lowStockMultiplier = $this->getContainer()->get(LowStockMultiplier::class);
     $configService = $this->getContainer()->get(ConfigurationService::class);
@@ -50,10 +52,10 @@ test('LowStockMultiplier returns multiplier from configuration', function () {
     $result = $lowStockMultiplier->getValue();
 
     // Assert
-    expect($result)->toBe((float)$testMultiplier);
+    expect($result)->toBe((float) $testMultiplier);
 });
 
-test('LowStockMultiplier returns default multiplier when not configured', function () {
+test('LowStockMultiplier returns default multiplier when not configured', function (): void {
     // Arrange
     $lowStockMultiplier = $this->getContainer()->get(LowStockMultiplier::class);
     $configService = $this->getContainer()->get(ConfigurationService::class);
@@ -65,10 +67,10 @@ test('LowStockMultiplier returns default multiplier when not configured', functi
     $result = $lowStockMultiplier->getValue();
 
     // Assert
-    expect($result)->toBe((float)SystemConfig::DEFAULT_STOCK_LOW_MULTIPLIER);
+    expect($result)->toBe((float) SystemConfig::DEFAULT_STOCK_LOW_MULTIPLIER);
 });
 
-test('LowStockMultiplier converts string value to float', function () {
+test('LowStockMultiplier converts string value to float', function (): void {
     // Arrange
     $lowStockMultiplier = $this->getContainer()->get(LowStockMultiplier::class);
     $configService = $this->getContainer()->get(ConfigurationService::class);
diff --git a/tests/Feature/Service/ConfigurationServiceTest.php b/tests/Feature/Service/ConfigurationServiceTest.php
index 1b38dfe..20e5ab2 100644
--- a/tests/Feature/Service/ConfigurationServiceTest.php
+++ b/tests/Feature/Service/ConfigurationServiceTest.php
@@ -1,12 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 use App\Entity\SystemConfig;
 use App\Enum\SystemSettingKey;
-use App\Repository\SystemConfigRepository;
 use App\Service\ConfigurationService;
-use Doctrine\ORM\EntityManagerInterface;
 
-test('getAllConfigs returns all configurations', function () {
+test('getAllConfigs returns all configurations', function (): void {
     // Arrange
     $configService = $this->getContainer()->get(ConfigurationService::class);
 
@@ -17,7 +17,7 @@ test('getAllConfigs returns all configurations', function () {
     expect($configs)->toBeArray();
 });
 
-test('getConfigValue returns correct value', function () {
+test('getConfigValue returns correct value', function (): void {
     // Arrange
     $configService = $this->getContainer()->get(ConfigurationService::class);
     $key = SystemSettingKey::SYSTEM_NAME;
@@ -30,7 +30,7 @@ test('getConfigValue returns correct value', function () {
     expect($value)->toBe($expectedValue);
 });
 
-test('setConfigValue updates configuration value', function () {
+test('setConfigValue updates configuration value', function (): void {
     // Arrange
     $configService = $this->getContainer()->get(ConfigurationService::class);
     $key = SystemSettingKey::SYSTEM_NAME;
@@ -44,7 +44,7 @@ test('setConfigValue updates configuration value', function () {
     expect($value)->toBe($newValue);
 });
 
-test('getConfigByKey returns correct config', function () {
+test('getConfigByKey returns correct config', function (): void {
     // Arrange
     $configService = $this->getContainer()->get(ConfigurationService::class);
     $key = SystemSettingKey::SYSTEM_NAME;
@@ -57,7 +57,7 @@ test('getConfigByKey returns correct config', function () {
         ->and($config->getKey())->toBe($key);
 });
 
-test('createConfig throws exception when config already exists', function () {
+test('createConfig throws exception when config already exists', function (): void {
     // Arrange
     $configService = $this->getContainer()->get(ConfigurationService::class);
     $key = SystemSettingKey::SYSTEM_NAME;
@@ -71,7 +71,7 @@ test('createConfig throws exception when config already exists', function () {
         ->toThrow(InvalidArgumentException::class);
 });
 
-test('updateConfig updates configuration value', function () {
+test('updateConfig updates configuration value', function (): void {
     // Arrange
     $configService = $this->getContainer()->get(ConfigurationService::class);
     $key = SystemSettingKey::SYSTEM_NAME;
@@ -90,7 +90,7 @@ test('updateConfig updates configuration value', function () {
         ->and($configService->getConfigValue($key))->toBe($newValue);
 });
 
-test('updateConfig does not update when value is empty', function () {
+test('updateConfig does not update when value is empty', function (): void {
     // Arrange
     $configService = $this->getContainer()->get(ConfigurationService::class);
     $key = SystemSettingKey::SYSTEM_NAME;
@@ -108,7 +108,7 @@ test('updateConfig does not update when value is empty', function () {
     expect($configService->getConfigValue($key))->toBe($initialValue);
 });
 
-test('resetAllConfigs resets all configurations to default values', function () {
+test('resetAllConfigs resets all configurations to default values', function (): void {
     // Arrange
     $configService = $this->getContainer()->get(ConfigurationService::class);
 
@@ -128,7 +128,7 @@ test('resetAllConfigs resets all configurations to default values', function ()
     }
 });
 
-test('setDefaultValue sets default value for specific key', function () {
+test('setDefaultValue sets default value for specific key', function (): void {
     // Arrange
     $configService = $this->getContainer()->get(ConfigurationService::class);
     $key = SystemSettingKey::SYSTEM_NAME;
diff --git a/tests/Feature/Service/DrinkTypeServiceTest.php b/tests/Feature/Service/DrinkTypeServiceTest.php
index 547df50..c3fdf8d 100644
--- a/tests/Feature/Service/DrinkTypeServiceTest.php
+++ b/tests/Feature/Service/DrinkTypeServiceTest.php
@@ -1,13 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
 use App\Entity\DrinkType;
 use App\Enum\SystemSettingKey;
-use App\Repository\DrinkTypeRepository;
 use App\Service\ConfigurationService;
 use App\Service\DrinkTypeService;
 use Doctrine\ORM\EntityManagerInterface;
 
-test('getAllDrinkTypes returns all drink types', function () {
+test('getAllDrinkTypes returns all drink types', function (): void {
     // Arrange
     $drinkTypeService = $this->getContainer()->get(DrinkTypeService::class);
 
@@ -18,7 +19,7 @@ test('getAllDrinkTypes returns all drink types', function () {
     expect($drinkTypes)->toBeArray();
 });
 
-test('getDrinkTypeById returns correct drink type', function () {
+test('getDrinkTypeById returns correct drink type', function (): void {
     // Arrange
     $drinkTypeService = $this->getContainer()->get(DrinkTypeService::class);
     $em = $this->getContainer()->get(EntityManagerInterface::class);
@@ -42,7 +43,7 @@ test('getDrinkTypeById returns correct drink type', function () {
     expect($retrievedDrinkType->getName())->toBe('Test Drink Type');
 });
 
-test('getDrinkTypeById returns null for non-existent id', function () {
+test('getDrinkTypeById returns null for non-existent id', function (): void {
     // Arrange
     $drinkTypeService = $this->getContainer()->get(DrinkTypeService::class);
     $nonExistentId = 9999;
@@ -54,7 +55,7 @@ test('getDrinkTypeById returns null for non-existent id', function () {
     expect($drinkType)->toBeNull();
 });
 
-test('getDrinkTypeByName returns correct drink type', function () {
+test('getDrinkTypeByName returns correct drink type', function (): void {
     // Arrange
     $drinkTypeService = $this->getContainer()->get(DrinkTypeService::class);
     $em = $this->getContainer()->get(EntityManagerInterface::class);
@@ -75,7 +76,7 @@ test('getDrinkTypeByName returns correct drink type', function () {
     expect($retrievedDrinkType->getName())->toBe('Test Drink Type By Name');
 });
 
-test('getDrinkTypeByName returns null for non-existent name', function () {
+test('getDrinkTypeByName returns null for non-existent name', function (): void {
     // Arrange
     $drinkTypeService = $this->getContainer()->get(DrinkTypeService::class);
     $nonExistentName = 'Non-Existent Drink Type';
@@ -87,7 +88,7 @@ test('getDrinkTypeByName returns null for non-existent name', function () {
     expect($drinkType)->toBeNull();
 });
 
-test('createDrinkType creates new drink type with provided values', function () {
+test('createDrinkType creates new drink type with provided values', function (): void {
     // Arrange
     $drinkTypeService = $this->getContainer()->get(DrinkTypeService::class);
     $name = 'New Drink Type';
@@ -104,7 +105,7 @@ test('createDrinkType creates new drink type with provided values', function ()
     expect($drinkType->getDesiredStock())->toBe($desiredStock);
 });
 
-test('createDrinkType creates new drink type with default desired stock', function () {
+test('createDrinkType creates new drink type with default desired stock', function (): void {
     // Arrange
     $drinkTypeService = $this->getContainer()->get(DrinkTypeService::class);
     $configService = $this->getContainer()->get(ConfigurationService::class);
@@ -122,10 +123,10 @@ test('createDrinkType creates new drink type with default desired stock', functi
     expect($drinkType)->toBeInstanceOf(DrinkType::class);
     expect($drinkType->getName())->toBe($name);
     expect($drinkType->getDescription())->toBe($description);
-    expect($drinkType->getDesiredStock())->toBe((int)$defaultDesiredStock);
+    expect($drinkType->getDesiredStock())->toBe((int) $defaultDesiredStock);
 });
 
-test('createDrinkType throws exception when drink type with same name exists', function () {
+test('createDrinkType throws exception when drink type with same name exists', function (): void {
     // Arrange
     $drinkTypeService = $this->getContainer()->get(DrinkTypeService::class);
     $name = 'Duplicate Drink Type';
@@ -138,7 +139,7 @@ test('createDrinkType throws exception when drink type with same name exists', f
         ->toThrow(InvalidArgumentException::class);
 });
 
-test('updateDrinkType updates drink type properties', function () {
+test('updateDrinkType updates drink type properties', function (): void {
     // Arrange
     $drinkTypeService = $this->getContainer()->get(DrinkTypeService::class);
     $em = $this->getContainer()->get(EntityManagerInterface::class);
@@ -170,7 +171,7 @@ test('updateDrinkType updates drink type properties', function () {
     expect($updatedDrinkType->getDesiredStock())->toBe($newDesiredStock);
 });
 
-test('updateDrinkType throws exception when updating to existing name', function () {
+test('updateDrinkType throws exception when updating to existing name', function (): void {
     // Arrange
     $drinkTypeService = $this->getContainer()->get(DrinkTypeService::class);
     $em = $this->getContainer()->get(EntityManagerInterface::class);
@@ -190,7 +191,7 @@ test('updateDrinkType throws exception when updating to existing name', function
         ->toThrow(InvalidArgumentException::class);
 });
 
-test('updateDrinkType only updates provided properties', function () {
+test('updateDrinkType only updates provided properties', function (): void {
     // Arrange
     $drinkTypeService = $this->getContainer()->get(DrinkTypeService::class);
     $em = $this->getContainer()->get(EntityManagerInterface::class);
@@ -220,7 +221,7 @@ test('updateDrinkType only updates provided properties', function () {
     expect($updatedDrinkType->getDesiredStock())->toBe(5);
 });
 
-test('deleteDrinkType removes drink type', function () {
+test('deleteDrinkType removes drink type', function (): void {
     // Arrange
     $drinkTypeService = $this->getContainer()->get(DrinkTypeService::class);
     $em = $this->getContainer()->get(EntityManagerInterface::class);
diff --git a/tests/Feature/Service/InventoryServiceTest.php b/tests/Feature/Service/InventoryServiceTest.php
index 1374816..8569ddd 100644
--- a/tests/Feature/Service/InventoryServiceTest.php
+++ b/tests/Feature/Service/InventoryServiceTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use App\Entity\DrinkType;
 use App\Entity\InventoryRecord;
 use App\Enum\StockState;
@@ -11,7 +13,7 @@ use App\Service\InventoryService;
 use App\ValueObject\DrinkStock;
 use Doctrine\ORM\EntityManagerInterface;
 
-test('getAllInventoryRecords returns all inventory records', function () {
+test('getAllInventoryRecords returns all inventory records', function (): void {
     // Arrange
     $inventoryService = $this->getContainer()->get(InventoryService::class);
 
@@ -22,7 +24,7 @@ test('getAllInventoryRecords returns all inventory records', function () {
     expect($records)->toBeArray();
 });
 
-test('getInventoryRecordsByDrinkType returns records for specific drink type', function () {
+test('getInventoryRecordsByDrinkType returns records for specific drink type', function (): void {
     // Arrange
     $inventoryService = $this->getContainer()->get(InventoryService::class);
     $em = $this->getContainer()->get(EntityManagerInterface::class);
@@ -56,7 +58,7 @@ test('getInventoryRecordsByDrinkType returns records for specific drink type', f
     expect($records[0]->getDrinkType()->getId())->toBe($drinkType->getId());
 });
 
-test('getLatestInventoryRecord returns latest record for drink type', function () {
+test('getLatestInventoryRecord returns latest record for drink type', function (): void {
     // Arrange
     $inventoryService = $this->getContainer()->get(InventoryService::class);
     $em = $this->getContainer()->get(EntityManagerInterface::class);
@@ -97,7 +99,7 @@ test('getLatestInventoryRecord returns latest record for drink type', function (
     expect($latestRecord->getQuantity())->toBe(12);
 });
 
-test('getLatestInventoryRecord creates new record if none exists', function () {
+test('getLatestInventoryRecord creates new record if none exists', function (): void {
     // Arrange
     $inventoryService = $this->getContainer()->get(InventoryService::class);
     $em = $this->getContainer()->get(EntityManagerInterface::class);
@@ -125,7 +127,7 @@ test('getLatestInventoryRecord creates new record if none exists', function () {
     expect($latestRecord->getQuantity())->toBe(0);
 });
 
-test('getCurrentStockLevel returns correct stock level', function () {
+test('getCurrentStockLevel returns correct stock level', function (): void {
     // Arrange
     $inventoryService = $this->getContainer()->get(InventoryService::class);
     $em = $this->getContainer()->get(EntityManagerInterface::class);
@@ -151,7 +153,7 @@ test('getCurrentStockLevel returns correct stock level', function () {
     expect($stockLevel)->toBe(15);
 });
 
-test('updateStockLevel creates new inventory record', function () {
+test('updateStockLevel creates new inventory record', function (): void {
     // Arrange
     $inventoryService = $this->getContainer()->get(InventoryService::class);
     $em = $this->getContainer()->get(EntityManagerInterface::class);
@@ -180,7 +182,7 @@ test('updateStockLevel creates new inventory record', function () {
     expect($currentLevel)->toBe($newQuantity);
 });
 
-test('getAllDrinkTypesWithStockLevels returns all drink types with stock', function () {
+test('getAllDrinkTypesWithStockLevels returns all drink types with stock', function (): void {
     // Arrange
     $inventoryService = $this->getContainer()->get(InventoryService::class);
     $em = $this->getContainer()->get(EntityManagerInterface::class);
@@ -227,7 +229,7 @@ test('getAllDrinkTypesWithStockLevels returns all drink types with stock', funct
     }
 });
 
-test('getDrinkStock returns correct DrinkStock object with CRITICAL state', function () {
+test('getDrinkStock returns correct DrinkStock object with CRITICAL state', function (): void {
     // Arrange
     $inventoryService = $this->getContainer()->get(InventoryService::class);
     $configService = $this->getContainer()->get(ConfigurationService::class);
@@ -259,7 +261,7 @@ test('getDrinkStock returns correct DrinkStock object with CRITICAL state', func
     expect($drinkStock->stock)->toBe(StockState::CRITICAL);
 });
 
-test('getDrinkStock returns correct DrinkStock object with LOW state', function () {
+test('getDrinkStock returns correct DrinkStock object with LOW state', function (): void {
     // Arrange
     $inventoryService = $this->getContainer()->get(InventoryService::class);
     $configService = $this->getContainer()->get(ConfigurationService::class);
@@ -267,7 +269,7 @@ test('getDrinkStock returns correct DrinkStock object with LOW state', function
 
     // Set low stock multiplier
     $lowStockMultiplier = 0.3;
-    $configService->setConfigValue(SystemSettingKey::STOCK_LOW_MULTIPLIER, (string)$lowStockMultiplier);
+    $configService->setConfigValue(SystemSettingKey::STOCK_LOW_MULTIPLIER, (string) $lowStockMultiplier);
 
     // Create a drink type with low quantity
     $desiredStock = 10;
@@ -278,7 +280,7 @@ test('getDrinkStock returns correct DrinkStock object with LOW state', function
     $em->flush();
 
     // Create inventory record with low quantity (between 0 and lowStockMultiplier * desiredStock)
-    $lowQuantity = (int)($desiredStock * $lowStockMultiplier) - 1;
+    $lowQuantity = (int) ($desiredStock * $lowStockMultiplier) - 1;
     $record = new InventoryRecord();
     $record->setDrinkType($drinkType);
     $record->setQuantity($lowQuantity);
@@ -294,7 +296,7 @@ test('getDrinkStock returns correct DrinkStock object with LOW state', function
     expect($drinkStock->stock)->toBe(StockState::LOW);
 });
 
-test('getDrinkStock returns correct DrinkStock object with NORMAL state', function () {
+test('getDrinkStock returns correct DrinkStock object with NORMAL state', function (): void {
     // Arrange
     $inventoryService = $this->getContainer()->get(InventoryService::class);
     $configService = $this->getContainer()->get(ConfigurationService::class);
@@ -302,7 +304,7 @@ test('getDrinkStock returns correct DrinkStock object with NORMAL state', functi
 
     // Set low stock multiplier
     $lowStockMultiplier = 0.3;
-    $configService->setConfigValue(SystemSettingKey::STOCK_LOW_MULTIPLIER, (string)$lowStockMultiplier);
+    $configService->setConfigValue(SystemSettingKey::STOCK_LOW_MULTIPLIER, (string) $lowStockMultiplier);
 
     // Create a drink type with normal quantity
     $desiredStock = 10;
@@ -313,7 +315,7 @@ test('getDrinkStock returns correct DrinkStock object with NORMAL state', functi
     $em->flush();
 
     // Create inventory record with normal quantity (between lowStockMultiplier * desiredStock and desiredStock)
-    $normalQuantity = (int)($desiredStock * $lowStockMultiplier) + 1;
+    $normalQuantity = (int) ($desiredStock * $lowStockMultiplier) + 1;
     $record = new InventoryRecord();
     $record->setDrinkType($drinkType);
     $record->setQuantity($normalQuantity);
@@ -329,7 +331,7 @@ test('getDrinkStock returns correct DrinkStock object with NORMAL state', functi
     expect($drinkStock->stock)->toBe(StockState::NORMAL);
 });
 
-test('getDrinkStock returns correct DrinkStock object with HIGH state', function () {
+test('getDrinkStock returns correct DrinkStock object with HIGH state', function (): void {
     // Arrange
     $inventoryService = $this->getContainer()->get(InventoryService::class);
     $configService = $this->getContainer()->get(ConfigurationService::class);
diff --git a/tests/Feature/Service/OrderServiceTest.php b/tests/Feature/Service/OrderServiceTest.php
index 6b593ad..26e3777 100644
--- a/tests/Feature/Service/OrderServiceTest.php
+++ b/tests/Feature/Service/OrderServiceTest.php
@@ -1,17 +1,17 @@
 <?php
 
+declare(strict_types=1);
+
 use App\Entity\DrinkType;
 use App\Entity\Order;
 use App\Entity\OrderItem;
 use App\Enum\OrderStatus;
-use App\Repository\DrinkTypeRepository;
 use App\Repository\OrderItemRepository;
-use App\Repository\OrderRepository;
 use App\Service\InventoryService;
 use App\Service\OrderService;
 use Doctrine\ORM\EntityManagerInterface;
 
-test('getAllOrders returns all orders', function () {
+test('getAllOrders returns all orders', function (): void {
     // Arrange
     $orderService = $this->getContainer()->get(OrderService::class);
 
@@ -22,7 +22,7 @@ test('getAllOrders returns all orders', function () {
     expect($orders)->toBeArray();
 });
 
-test('getOrderById returns correct order', function () {
+test('getOrderById returns correct order', function (): void {
     // Arrange
     $orderService = $this->getContainer()->get(OrderService::class);
     $em = $this->getContainer()->get(EntityManagerInterface::class);
@@ -43,7 +43,7 @@ test('getOrderById returns correct order', function () {
     expect($retrievedOrder->getId())->toBe($id);
 });
 
-test('getOrderById returns null for non-existent id', function () {
+test('getOrderById returns null for non-existent id', function (): void {
     // Arrange
     $orderService = $this->getContainer()->get(OrderService::class);
     $nonExistentId = 9999;
@@ -55,7 +55,7 @@ test('getOrderById returns null for non-existent id', function () {
     expect($order)->toBeNull();
 });
 
-test('getOrdersByStatus returns orders with specific status', function () {
+test('getOrdersByStatus returns orders with specific status', function (): void {
     // Arrange
     $orderService = $this->getContainer()->get(OrderService::class);
     $em = $this->getContainer()->get(EntityManagerInterface::class);
@@ -95,7 +95,7 @@ test('getOrdersByStatus returns orders with specific status', function () {
     }
 });
 
-test('getActiveOrders returns orders with active statuses', function () {
+test('getActiveOrders returns orders with active statuses', function (): void {
     // Arrange
     $orderService = $this->getContainer()->get(OrderService::class);
     $em = $this->getContainer()->get(EntityManagerInterface::class);
@@ -130,7 +130,7 @@ test('getActiveOrders returns orders with active statuses', function () {
     }
 });
 
-test('getMostRecentActiveOrder returns most recent active order', function () {
+test('getMostRecentActiveOrder returns most recent active order', function (): void {
     // Arrange
     $orderService = $this->getContainer()->get(OrderService::class);
     $em = $this->getContainer()->get(EntityManagerInterface::class);
@@ -158,7 +158,7 @@ test('getMostRecentActiveOrder returns most recent active order', function () {
     expect($recentOrder->getId())->toBe($order2->getId());
 });
 
-test('hasActiveOrders returns true when active orders exist', function () {
+test('hasActiveOrders returns true when active orders exist', function (): void {
     // Arrange
     $orderService = $this->getContainer()->get(OrderService::class);
     $em = $this->getContainer()->get(EntityManagerInterface::class);
@@ -176,7 +176,7 @@ test('hasActiveOrders returns true when active orders exist', function () {
     expect($hasActiveOrders)->toBeTrue();
 });
 
-test('getOrdersByDateRange returns orders within date range', function () {
+test('getOrdersByDateRange returns orders within date range', function (): void {
     // Arrange
     $orderService = $this->getContainer()->get(OrderService::class);
     $em = $this->getContainer()->get(EntityManagerInterface::class);
@@ -204,7 +204,7 @@ test('getOrdersByDateRange returns orders within date range', function () {
     }
 });
 
-test('createOrder creates new order with items', function () {
+test('createOrder creates new order with items', function (): void {
     // Arrange
     $orderService = $this->getContainer()->get(OrderService::class);
     $em = $this->getContainer()->get(EntityManagerInterface::class);
@@ -222,8 +222,14 @@ test('createOrder creates new order with items', function () {
     $em->flush();
 
     $items = [
-        ['drinkTypeId' => $drinkType1->getId(), 'quantity' => 3],
-        ['drinkTypeId' => $drinkType2->getId(), 'quantity' => 2],
+        [
+            'drinkTypeId' => $drinkType1->getId(),
+            'quantity' => 3,
+        ],
+        [
+            'drinkTypeId' => $drinkType2->getId(),
+            'quantity' => 2,
+        ],
     ];
 
     // Act
@@ -241,7 +247,7 @@ test('createOrder creates new order with items', function () {
     expect($orderItems[1]->getQuantity())->toBe(2);
 });
 
-test('createOrderFromStockLevels creates order based on stock levels', function () {
+test('createOrderFromStockLevels creates order based on stock levels', function (): void {
     // Arrange
     $orderService = $this->getContainer()->get(OrderService::class);
     $inventoryService = $this->getContainer()->get(InventoryService::class);
@@ -295,7 +301,7 @@ test('createOrderFromStockLevels creates order based on stock levels', function
     }
 });
 
-test('updateOrderStatus updates order status', function () {
+test('updateOrderStatus updates order status', function (): void {
     // Arrange
     $orderService = $this->getContainer()->get(OrderService::class);
     $em = $this->getContainer()->get(EntityManagerInterface::class);
@@ -316,7 +322,7 @@ test('updateOrderStatus updates order status', function () {
     // Verify the status was updated in the database
 });
 
-test('addOrderItem adds item to order', function () {
+test('addOrderItem adds item to order', function (): void {
     // Arrange
     $orderService = $this->getContainer()->get(OrderService::class);
     $em = $this->getContainer()->get(EntityManagerInterface::class);
@@ -348,7 +354,7 @@ test('addOrderItem adds item to order', function () {
     expect($order->getOrderItems()->contains($orderItem))->toBeTrue();
 });
 
-test('addOrderItem updates quantity if item already exists', function () {
+test('addOrderItem updates quantity if item already exists', function (): void {
     // Arrange
     $orderService = $this->getContainer()->get(OrderService::class);
     $em = $this->getContainer()->get(EntityManagerInterface::class);
@@ -380,12 +386,12 @@ test('addOrderItem updates quantity if item already exists', function () {
 
     // Verify the order still has only one item for this drink type
     $matchingItems = $order->getOrderItems()->filter(
-        fn($item) => $item->getDrinkType()->getId() === $drinkType->getId()
+        fn($item): bool => $item->getDrinkType()->getId() === $drinkType->getId()
     );
     expect($matchingItems->count())->toBe(1);
 });
 
-test('removeOrderItem removes item from order', function () {
+test('removeOrderItem removes item from order', function (): void {
     // Arrange
     $orderService = $this->getContainer()->get(OrderService::class);
     $em = $this->getContainer()->get(EntityManagerInterface::class);
@@ -414,12 +420,12 @@ test('removeOrderItem removes item from order', function () {
     // Verify the item was removed from the database
     $em->refresh($order);
     $matchingItems = $order->getOrderItems()->filter(
-        fn($item) => $item->getDrinkType()->getId() === $drinkType->getId()
+        fn($item): bool => $item->getDrinkType()->getId() === $drinkType->getId()
     );
     expect($matchingItems->count())->toBe(0);
 });
 
-test('deleteOrder removes order and its items', function () {
+test('deleteOrder removes order and its items', function (): void {
     // Arrange
     $orderService = $this->getContainer()->get(OrderService::class);
     $em = $this->getContainer()->get(EntityManagerInterface::class);
diff --git a/tests/Pest.php b/tests/Pest.php
index 13d5304..df1e181 100644
--- a/tests/Pest.php
+++ b/tests/Pest.php
@@ -1,7 +1,8 @@
 <?php
 
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\Tools\SchemaTool;
+declare(strict_types=1);
+
+use Tests\DbTestCase;
 
 /*
 |--------------------------------------------------------------------------
@@ -14,7 +15,7 @@ use Doctrine\ORM\Tools\SchemaTool;
 |
 */
 
-pest()->extend(Tests\DbTestCase::class)->in('Feature');
+pest()->extend(DbTestCase::class)->in('Feature');
 
 /*
 |--------------------------------------------------------------------------
@@ -26,4 +27,3 @@ pest()->extend(Tests\DbTestCase::class)->in('Feature');
 | global functions to help you to reduce the number of lines of code in your test files.
 |
 */
-
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 40e41e2..8966cfd 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -1,10 +1,9 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Tests;
 
-use PHPUnit\Framework\TestCase as BaseTestCase;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
-abstract class TestCase extends KernelTestCase
-{
-}
+abstract class TestCase extends KernelTestCase {}
diff --git a/tests/Unit/ExampleTest.php b/tests/Unit/ExampleTest.php
index 61cd84c..3dbe6e4 100644
--- a/tests/Unit/ExampleTest.php
+++ b/tests/Unit/ExampleTest.php
@@ -1,5 +1,7 @@
 <?php
 
-test('example', function () {
+declare(strict_types=1);
+
+test('example', function (): void {
     expect(true)->toBeTrue();
 });
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 47a5855..8ac54b9 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,13 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 use Symfony\Component\Dotenv\Dotenv;
 
-require dirname(__DIR__).'/vendor/autoload.php';
+require dirname(__DIR__) . '/vendor/autoload.php';
 
 if (method_exists(Dotenv::class, 'bootEnv')) {
-    (new Dotenv())->bootEnv(dirname(__DIR__).'/.env');
+    new Dotenv()->bootEnv(dirname(__DIR__) . '/.env');
 }
 
 if ($_SERVER['APP_DEBUG']) {
-    umask(0000);
+    umask(0o000);
 }