bonamin
24a029a8cc
Backend:
- OrderItemInput accepts option objects {id,name,price_delta} instead of int IDs
- extra_cost from selected options added to unit_price snapshot
- GET /api/products/?all=true for manager (includes unavailable)
- PUT /api/products/{id} now replaces options, ingredients, preference_sets
- POST /api/products/{id}/image — persistent image upload to /app/data/product_images
- New models: ProductPreferenceSet, ProductPreferenceChoice, TableGroup
- tables: group_id FK, hard delete (?hard=true), batch create POST /api/tables/batch
- GET /api/tables/groups + POST/PUT/DELETE groups endpoints
- POST /api/auth/me endpoint for token rehydration
- Auto-migration on startup for new columns
PWA:
- AuthRehydrator: fetches /auth/me on load so isMyOrder works after page reload
- 401 response force-logs out (covers blocked waiters)
- ItemOptionsModal: uses extra_cost correctly, shows preferences as radio buttons
Manager:
- ProductsPage: shows unavailable products greyed out, category color picker + reorder,
full option/ingredient/preference editing, image upload
- TablesPage: table groups, auto-increment, deactivate vs hard delete, batch add
78 lines
2.9 KiB
Python
78 lines
2.9 KiB
Python
from sqlalchemy import Column, Integer, String, Boolean, Float, ForeignKey
|
|
from sqlalchemy.orm import relationship
|
|
from database import Base
|
|
|
|
|
|
class Category(Base):
|
|
__tablename__ = "categories"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
name = Column(String, nullable=False)
|
|
color = Column(String, nullable=True)
|
|
sort_order = Column(Integer, default=0)
|
|
|
|
products = relationship("Product", back_populates="category")
|
|
|
|
|
|
class Product(Base):
|
|
__tablename__ = "products"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
name = Column(String, nullable=False)
|
|
category_id = Column(Integer, ForeignKey("categories.id"), nullable=True)
|
|
base_price = Column(Float, nullable=False)
|
|
is_available = Column(Boolean, default=True, nullable=False)
|
|
printer_zone_id = Column(Integer, ForeignKey("printers.id"), nullable=True)
|
|
image_url = Column(String, nullable=True)
|
|
|
|
category = relationship("Category", back_populates="products")
|
|
printer_zone = relationship("Printer", back_populates="products")
|
|
options = relationship("ProductOption", back_populates="product", cascade="all, delete-orphan")
|
|
ingredients = relationship("ProductIngredient", back_populates="product", cascade="all, delete-orphan")
|
|
preference_sets = relationship("ProductPreferenceSet", back_populates="product", cascade="all, delete-orphan")
|
|
order_items = relationship("OrderItem", back_populates="product")
|
|
|
|
|
|
class ProductOption(Base):
|
|
__tablename__ = "product_options"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
product_id = Column(Integer, ForeignKey("products.id"), nullable=False)
|
|
name = Column(String, nullable=False)
|
|
extra_cost = Column(Float, default=0.0)
|
|
|
|
product = relationship("Product", back_populates="options")
|
|
|
|
|
|
class ProductIngredient(Base):
|
|
__tablename__ = "product_ingredients"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
product_id = Column(Integer, ForeignKey("products.id"), nullable=False)
|
|
name = Column(String, nullable=False)
|
|
extra_cost = Column(Float, default=0.0)
|
|
|
|
product = relationship("Product", back_populates="ingredients")
|
|
|
|
|
|
class ProductPreferenceSet(Base):
|
|
__tablename__ = "product_preference_sets"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
product_id = Column(Integer, ForeignKey("products.id"), nullable=False)
|
|
name = Column(String, nullable=False)
|
|
|
|
product = relationship("Product", back_populates="preference_sets")
|
|
choices = relationship("ProductPreferenceChoice", back_populates="set", cascade="all, delete-orphan")
|
|
|
|
|
|
class ProductPreferenceChoice(Base):
|
|
__tablename__ = "product_preference_choices"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
set_id = Column(Integer, ForeignKey("product_preference_sets.id"), nullable=False)
|
|
name = Column(String, nullable=False)
|
|
extra_cost = Column(Float, default=0.0)
|
|
|
|
set = relationship("ProductPreferenceSet", back_populates="choices")
|