diff --git a/frontend/Entry.elm b/frontend/Entry.elm index 503fe4e..a8fc8e0 100644 --- a/frontend/Entry.elm +++ b/frontend/Entry.elm @@ -200,7 +200,7 @@ suggestedGrossPrice netPrice percentage = view { globals, state } = case state of ItemSearch model -> fieldset [] - [ legend [] [ text "Vorlage für neuen Inventareintrag" ] + [ legend [] [ text "Vorlage für Auftrag wählen" ] , Html.form [ onSubmit SubmitSearch ] [ div [ class "form-input" ] [ label [ for "search-term", title "Barcode oder Name" ] [ text "Suchbegriff" ] diff --git a/jon/entry.py b/jon/entry.py index c3b6a8d..dc5464c 100644 --- a/jon/entry.py +++ b/jon/entry.py @@ -9,13 +9,27 @@ bp = Blueprint("entry", __name__, url_prefix="/entry") @bp.route("/", methods=["GET", "POST"]) def index(): - cart = session["cart"] + cart = session.get("cart", default=[]) return render_template( "entry/index.html", cart=cart ) +@bp.post("/delete-order") +def delete_order(): + try: + order_index = int(request.form["order-index"]) + except: + return f"Incomplete or mistyped form", 400 + + cart = session.get("cart", default=[]) + del cart[order_index] + session["cart"] = cart + + return redirect(request.referrer) + + @bp.route("/new-order", methods=["GET", "POST"]) def new_order(): if request.method == "POST": @@ -28,7 +42,7 @@ def new_order(): tax_group_id = int(request.form["tax-group"]) net_unit_price = float(request.form["net-unit-price"]) gross_unit_price = float(request.form["gross-unit-price"]) - except Exception as e: + except: return f"Incomplete or mistyped form", 400 cart = session.get("cart", default=[]) diff --git a/jon/static/entry.js b/jon/static/entry.js index f5720f3..815a6ab 100644 --- a/jon/static/entry.js +++ b/jon/static/entry.js @@ -11949,7 +11949,7 @@ var $author$project$Entry$view = function (_v0) { _List_Nil, _List_fromArray( [ - $elm$html$Html$text('Vorlage für neuen Inventareintrag') + $elm$html$Html$text('Vorlage für Auftrag wählen') ])), A2( $elm$html$Html$form, diff --git a/jon/templates/entry/index.html b/jon/templates/entry/index.html index 6e9de2f..6956836 100644 --- a/jon/templates/entry/index.html +++ b/jon/templates/entry/index.html @@ -13,6 +13,7 @@ Steuergruppen-ID EK-Preis (Netto) VK-Preis (Brutto) + Aktionen {% for cart_item in cart %} @@ -24,6 +25,12 @@ {{ cart_item.tax_group_id }} {{ format_currency(cart_item.net_unit_price) }} {{ format_currency(cart_item.gross_unit_price) }} + +
+ + +
+ {% endfor %}