From b3166811e57b40e1bde204387e5c38aa0311cdbe Mon Sep 17 00:00:00 2001 From: Niklas Meinzer Date: Wed, 29 Oct 2025 10:31:09 +0100 Subject: [PATCH] Started with area page --- src/allmende_payment_system/api/shop.py | 10 +++++ src/allmende_payment_system/app.py | 3 ++ src/allmende_payment_system/models.py | 14 ++++++- .../static/img/placeholder.jpg | Bin 0 -> 5924 bytes .../templates/area.html.jinja | 36 ++++++++++++++++++ .../templates/shop.html.jinja | 4 +- src/allmende_payment_system/tools.py | 14 +++++++ 7 files changed, 78 insertions(+), 3 deletions(-) create mode 100644 src/allmende_payment_system/static/img/placeholder.jpg create mode 100644 src/allmende_payment_system/templates/area.html.jinja diff --git a/src/allmende_payment_system/api/shop.py b/src/allmende_payment_system/api/shop.py index 71be710..9a7d868 100644 --- a/src/allmende_payment_system/api/shop.py +++ b/src/allmende_payment_system/api/shop.py @@ -18,3 +18,13 @@ async def get_shop(request: Request, session: SessionDep): "shop.html.jinja", context={"request": request, "areas": areas}, ) + + +@shop_router.get("/shop/area/{area_id}") +async def get_shop(request: Request, session: SessionDep, area_id: int): + query = select(Area).where(Area.id == area_id) + area = session.scalars(query).one() + return templates.TemplateResponse( + "area.html.jinja", + context={"request": request, "area": area}, + ) diff --git a/src/allmende_payment_system/app.py b/src/allmende_payment_system/app.py index c51e0bf..d7ae837 100644 --- a/src/allmende_payment_system/app.py +++ b/src/allmende_payment_system/app.py @@ -1,3 +1,5 @@ +import locale + from fastapi import Depends, FastAPI from fastapi.staticfiles import StaticFiles @@ -5,6 +7,7 @@ from allmende_payment_system.api import root_router from allmende_payment_system.api.dependencies import get_user from allmende_payment_system.api.shop import shop_router +locale.setlocale(locale.LC_ALL, "de_DE.UTF-8") app = FastAPI(dependencies=[Depends(get_user)]) diff --git a/src/allmende_payment_system/models.py b/src/allmende_payment_system/models.py index b9bff74..9400be1 100644 --- a/src/allmende_payment_system/models.py +++ b/src/allmende_payment_system/models.py @@ -55,6 +55,15 @@ class Area(Base): description: Mapped[str] = mapped_column(nullable=True) image_path: Mapped[str] = mapped_column(nullable=True) + products: Mapped[list["Product"]] = relationship("Product") + + +UnitsOfMeasure = typing.Literal[ + "g", + "kg", + "piece", +] + class Product(Base): __tablename__ = TABLE_PREFIX + "product" @@ -62,11 +71,14 @@ class Product(Base): name: Mapped[str] = mapped_column(nullable=False, unique=True) price: Mapped[decimal.Decimal] = mapped_column(Numeric(10, 2)) + unit_of_measure: Mapped[UnitsOfMeasure] = mapped_column(nullable=False) # TODO: limit this to actually used vat rates? vat_rate: Mapped[decimal.Decimal] = mapped_column(Numeric(10, 2)) area_id: Mapped[int] = mapped_column(ForeignKey(TABLE_PREFIX + "area.id")) - area: Mapped["Area"] = relationship("Area") + area: Mapped["Area"] = relationship("Area", back_populates="products") + + image_path: Mapped[str] = mapped_column(nullable=True) TransactionTypes = typing.Literal[ diff --git a/src/allmende_payment_system/static/img/placeholder.jpg b/src/allmende_payment_system/static/img/placeholder.jpg new file mode 100644 index 0000000000000000000000000000000000000000..9602b3d3aa4c8c8dc4b0700cc72bc36a2d27e97c GIT binary patch literal 5924 zcmeHL3p7;w8voCXcS_@(=NLLC!aR^z9(6s-`!$N@W~b^!u z6iNxzsT74Hl}AKzk~~sTBd_NEH+r3W?po)b`&f6a>$CRu`~Sc1`|WT4_P5sF-|#wl zPr%B}mYXaA3IzZP{sCT}0M3HV@B?7eCJi7201yGo02-bFh=m702_s>k0fC=k@kNaI zLl`tSljeSHml*DJUr`@gNBbrV0uOt`HJhp(Kfw zRQjil_cOo>fqh^f289P`EDD1~@#=sA(gI$5PL=-jmXO1rw!F&^{1;NQC>cSj6## z2Zcqe@VbB~2G)VaV1X%^O8{<{2rjn!{%SqbT~&AZa?Sp4{v^crrsVu15C?pfXPbBAJz6cRHpC=p$4Aq13>g$ zXhy!Yxq)r#vM-qxW3HrLNRu{6D$Fl0GxM*YkVVq!a`ZPpb@LV}m`#?*=v=PrZLeV} za%eIKx2MuSI=XcFI1hAw2D{o^H`>@wCuE$AmAyB4TQ!*z5boykJR#v=QBhHCt7DLy z@Tlhs;r!S=meuNhp82#FksgC*uSw0eT&$r)baY)UZkbCIlYb@u?(jhd$FhrIe~XlS zr=GO!sbvXg)Z1ckWTa_~2PVnSN8U(s&aumnvD&1PzT0U$emUjA71!4nDES)fROZu? z<4Hd=3Z}yx-nm|_y%G8s0Cf89_#NE3azMvi6D2`6wa|>O$j#pm<=CO2!FXO(ec{X* zKQlgxIrFF$r{Te^y*e?G?iaEQJ4-Jx6gOIUI@wOU2Bu>#HM{GLxmwf|Ocu=9h`$^0 zy8G_V$@qZx4i3M@HpX|o)6Z?=>N_K(e7=B_T7a_0eoaX-?<@R!Fu>sSf~bgdxI+TguwR03v)vRh3Q z-S1A=OLH@JSTGw`SIv5eoa*J!_O`#V@QJ!u5_vW^H`k@8VtwX`@^$%*l>^o^>wc?i z_;<27b~g8qek+z%!=3E>F>SzmR=A1a_HucqMiTjCj_@i?=dI!fhkbfG@J)@WlD#=w zM|~2y3M)%Y8=NWEY?f+Ksk+z8SpCO~!2hbz%kCTu@#Qbl-KCV!K4`~Z1j@p)olHJACr^YGM zc5D7g2+S{OZve`?hwu#{d}RlV6=FyrFvGN|zQI0pZCY>;flUn|khF;eU}VY;q0)BJ zSvViMKZ9wEe_3-Ck7M{6$qgY!wh4ILdWCkf)dg)`fe0zc*?Pg zYf^YspZ(=9Q)Zs?BP9Z0CUnRz4585d(Fuo8aY*&$96BQjoHu+7`7OZcXpc{bl|53+ z22M>ijZJ>r2cFsgr=U1L&L@x{q>B_G8XeoG_I%Bi8zDzozby)g^X<1-C-Z~czbl&0 z4p-m3{A%S54zcvKJ-0ur%|myUyM|_+jqOFNZEuz9hontkty79|ox!!o=xrv8u0?*Fvnu**vp3oUS+*gHhF7-&X&dPkT z>ZqQB-TIef8Kc8VDQE7!SY3WEkgUz|Z|<;j+7+zBDb|1MU$OVpFIJOJ)?eld$KS6b zPWLh^ShfzEtGT6Cftw<74`xS4lZ7%Bf4X336Km0Sda8P;L|f}wc;#2`PjemKWDhK} z<-7^F-{g4PQ=+7L$T=tdl>E!_v7}x>qxXgZFK+1^=>Aobn9y~XvqlNvNrem}+Sk0`6;K5!CSdt=wA2`6#) z31`j$56zKEkruhP4!&=~b12c6!fAPW0U?NTxo3|@`|ur(9reVI{$9oLQ{3Z^OV*0T zct!v4T030LYFoFLx!Cr%7SxxGEoC{XZBlVp2`1OsS;IQbk+J-Tyq}~ec=xqEOJzMD zZs$m}a}>+RO>?-z{oFB5Pme#xtJKD|XyS~AgZtl69Cn=WG7mVn)@<$O^Y&Hg*)9^j zQG*{YtyFZ{cq)=BQ5O}LIXio#f3m7QxnE|>_cu2W#W|hS(__`H{iQfJ*J0DpAnAmh zJUzc9jB=o7Pf3SJNwX7`O8MHW=-?DL+dyWrfA9$)bJtm=kU TsS)l+{%qjK`}$pg;ywHu{`hlp literal 0 HcmV?d00001 diff --git a/src/allmende_payment_system/templates/area.html.jinja b/src/allmende_payment_system/templates/area.html.jinja new file mode 100644 index 0000000..b7ec129 --- /dev/null +++ b/src/allmende_payment_system/templates/area.html.jinja @@ -0,0 +1,36 @@ +{% extends "base.html.jinja" %} +{% block content %} + +
+

{{ area.name }}

+

{{ area.description or ''}}

+
+ + +
+ {% for product in area.products %} +
+
+ + + {{ product.name }} + +
+
{{ product.name }}
+

{{ product.description }}

+
+ {{ product.price|format_number }} € pro {{ product.unit_of_measure|units_of_measure_de }} + +
+
+ +
+
+ {% endfor %} +
+{% endblock %} diff --git a/src/allmende_payment_system/templates/shop.html.jinja b/src/allmende_payment_system/templates/shop.html.jinja index 71176ea..d2288cf 100644 --- a/src/allmende_payment_system/templates/shop.html.jinja +++ b/src/allmende_payment_system/templates/shop.html.jinja @@ -9,13 +9,13 @@
{% for area in areas %}
- +
{{ area.name }} Jinja2Templates: renderer = Jinja2Templates(directory="src/allmende_payment_system/templates") renderer.env.filters["transaction_type_de"] = lambda x: TRANSACTION_TYPE_DE[x] + renderer.env.filters["units_of_measure_de"] = lambda x: UNITS_OF_MEASURE.get(x, x) + renderer.env.filters["format_number"] = format_number return renderer