feat: potvrzení o úhradě objednávky

client/src/pages/OrderGroupsPage.tsx

@@ -2,7 +2,7 @@ import { useContext, useEffect, useRef, useState } from 'react';
 import { Alert, Badge, Button, Card, Form, Modal, Table } from 'react-bootstrap';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faTrashCan } from '@fortawesome/free-regular-svg-icons';
-import { faBasketShopping, faGear, faLock, faLockOpen, faSearch, faUserPlus } from '@fortawesome/free-solid-svg-icons';
+import { faBasketShopping, faCircleCheck, faGear, faLock, faLockOpen, faSearch, faUserPlus } from '@fortawesome/free-solid-svg-icons';
 import {
     ClientData, GroupState, MealSlot, OrderGroup, OrderGroupMember,
     getData, createGroup, deleteGroup, addGroupMember, removeGroupMember, updateGroupMember, setGroupState, updateGroupTimes,
@@ -306,6 +306,9 @@ export default function OrderGroupsPage() {
                                                                     {memberLogin === group.creatorLogin && (
                                                                         <FontAwesomeIcon icon={faBasketShopping} className="ms-1 buyer-icon" title="Zakladatel / objednávající" />
                                                                     )}
+                                                                    {member.paid && (
+                                                                        <FontAwesomeIcon icon={faCircleCheck} className="ms-1 text-success" title="Zaplaceno" />
+                                                                    )}
                                                                 </span>
                                                             </td>
                                                             <td>

server/src/groups.ts

@@ -131,11 +131,22 @@ export async function setGroupState(login: string, groupId: string, newState: Gr
         await removePendingQrsByGroupId(memberLogins, groupId);
         group.orderedAt = undefined;
         group.deliveryAt = undefined;
+        for (const ml of memberLogins) {
+            group.members[ml] = { ...group.members[ml], paid: undefined };
+        }
     }
     group.state = newState;
     return saveExtraData(data, date);
 }
 
+export async function markGroupMemberPaid(login: string, groupId: string, date?: Date): Promise<ClientData | null> {
+    const data = await getExtraData(date);
+    const group = findGroup(data, groupId);
+    if (!group || !group.members[login]) return null;
+    group.members[login] = { ...group.members[login], paid: true };
+    return saveExtraData(data, date);
+}
+
 export async function updateGroupTimes(login: string, groupId: string, orderedAt?: string, deliveryAt?: string, date?: Date): Promise<ClientData> {
     const data = await getExtraData(date);
     const group = findGroup(data, groupId);

server/src/pizza.ts

@@ -449,12 +449,15 @@ export async function getPendingQrs(login: string): Promise<PendingQr[]> {
 
 /**
  * Označí QR kód jako uhrazený (odstraní ho ze seznamu nevyřízených).
+ * Vrátí odstraněný QR kód, pokud byl nalezen.
  */
-export async function dismissPendingQr(login: string, id: string): Promise<void> {
+export async function dismissPendingQr(login: string, id: string): Promise<PendingQr | undefined> {
     const key = getPendingQrKey(login);
     const existing = await storage.getData<PendingQr[]>(key) ?? [];
+    const dismissed = existing.find(qr => qr.id === id);
     const filtered = existing.filter(qr => qr.id !== id);
     await storage.setData(key, filtered);
+    return dismissed;
 }
 
 /**

server/src/routes/pizzaDayRoutes.ts

@@ -1,6 +1,7 @@
 import express, { Request } from "express";
 import { getLogin } from "../auth";
 import { createPizzaDay, deletePizzaDay, getPizzaList, getSalatList, addPizzaOrder, addSalatOrder, removePizzaOrder, lockPizzaDay, unlockPizzaDay, finishPizzaOrder, finishPizzaDelivery, updatePizzaDayNote, updatePizzaFee, dismissPendingQr } from "../pizza";
+import { markGroupMemberPaid } from "../groups";
 import { parseToken } from "../utils";
 import { getWebsocket } from "../websocket";
 import { AddPizzaData, DismissQrData, FinishDeliveryData, RemovePizzaData, UpdatePizzaDayNoteData, UpdatePizzaFeeData } from "../../../types";
@@ -132,7 +133,11 @@ router.post("/dismissQr", async (req: Request<{}, any, DismissQrData["body"]>, r
         return res.status(400).json({ error: "Nebyl předán identifikátor QR kódu" });
     }
     try {
-        await dismissPendingQr(login, req.body.id);
+        const dismissed = await dismissPendingQr(login, req.body.id);
+        if (dismissed?.groupId) {
+            const updatedExtra = await markGroupMemberPaid(login, dismissed.groupId);
+            if (updatedExtra) getWebsocket().emit("message", updatedExtra);
+        }
         res.status(200).json({});
     } catch (e: any) { next(e) }
 });

types/schemas/_index.yml

@@ -715,6 +715,9 @@ OrderGroupMember:
     surchargeAmount:
       description: Výše příplatku v Kč
       type: number
+    paid:
+      description: Příznak, zda člen uhradil svůj podíl objednávky
+      type: boolean
 
 OrderGroup:
   description: Skupina uživatelů objednávajících z jednoho místa